3 files changed, 34 insertions, 33 deletions
diff --git a/nixDevEnv/overlays/dmdVersion.nix b/nixDevEnv/overlays/dmdVersion.nix
deleted file mode 100644
index 51e1f67..0000000
--- a/nixDevEnv/overlays/dmdVersion.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-self: super: rec {
-  version = "2.094.0";
-  sha256 = "0xhm8m46ahfx3hcibi3vws02zaplny3226f3x8cd8584gzfqyzxp";
-  year = "2020";
-  dmd = super.dmd.overrideAttrs(oldAttrs: rec {
-    inherit year version sha256;
-    pname = oldAttrs.pname;
-    name = "${pname}-${version}";
-    src = super.fetchurl {
-      url = "http://downloads.dlang.org/releases/${year}/dmd.${version}.linux.tar.xz";
-      sha256 = sha256;
-    };
-    # postUnpack = ''
-    #   patchShebangs .
-    # '';
-  });
-}
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
   ];
 }