2 files changed, 34 insertions, 16 deletions
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
   ];
 }