From 2d9778dc01c8ca6c5a915e1ee638251878990d10 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 13 Oct 2020 14:09:43 -0400
Subject: build nix derivation (using dub2nix helper tool)

- nix-shell
- nix-build

- dub2nix (dub to nix helper tool)
  - Lionello Lunesu
  - MIT License
  - https://github.com/lionello/dub2nix
---
 nixDevEnv/shells/dmd.nix | 23 +++++++++++++++--------
 nixDevEnv/shells/ldc.nix | 27 +++++++++++++++++++--------
 2 files changed, 34 insertions(+), 16 deletions(-)

(limited to 'nixDevEnv/shells')

diff --git a/nixDevEnv/shells/dmd.nix b/nixDevEnv/shells/dmd.nix
index f3d126c..0c68cc0 100644
--- a/nixDevEnv/shells/dmd.nix
+++ b/nixDevEnv/shells/dmd.nix
@@ -1,10 +1,17 @@
-{ pkgs ? import <nixpkgs> { overlays = [ (import ../overlays/dmdVersion.nix) ]; } }:
-  pkgs.mkShell {
-    buildInputs = with pkgs; [
-      dub
-      ninja
-      dmd
-      sqlite
-      validatePkgConfig
+{ pkgs ? import <nixpkgs> { overlays = []; } }:
+let
+  dub2nix-src = fetchTarball {
+    url = "https://github.com/lionello/dub2nix/archive/master.tar.gz";
+  };
+  dub2nix = (import dub2nix-src) { inherit pkgs; };
+in pkgs.mkShell {
+  buildInputs = with pkgs; [
+    nix
+    dub
+    dmd
+    rdmd
+    sqlite
+    dub2nix
+    nix-prefetch-git
   ];
 }
diff --git a/nixDevEnv/shells/ldc.nix b/nixDevEnv/shells/ldc.nix
index 1900112..31cfcfb 100644
--- a/nixDevEnv/shells/ldc.nix
+++ b/nixDevEnv/shells/ldc.nix
@@ -1,10 +1,21 @@
-{ pkgs ? import <nixpkgs> { overlays = [ (import ../overlays/ldcVersion.nix) ]; } }:
-  pkgs.mkShell {
-    buildInputs = with pkgs; [
-      dub
-      ninja
-      ldc
-      sqlite
-      validatePkgConfig
+{ pkgs ? import <nixpkgs> {
+  overlays = [
+    (import ./nixDevEnv/overlays/ldcVersion.nix)
+  ]; }
+}:
+let
+  dub2nix-src = fetchTarball {
+    url = "https://github.com/lionello/dub2nix/archive/master.tar.gz";
+  };
+  dub2nix = (import dub2nix-src) { inherit pkgs; };
+in pkgs.mkShell {
+  buildInputs = with pkgs; [
+    nix
+    dub
+    ldc
+    rdmd
+    sqlite
+    dub2nix
+    nix-prefetch-git
   ];
 }
-- 
cgit v1.2.3