ldc in need of newer dub

6 files changed, 34 insertions, 53 deletions

diff --git a/nixDevEnv/overlays/ldcVersion.nix b/nixDevEnv/overlays/ldcVersion.nix
index 5990004..5bc7f7a 100644
--- a/nixDevEnv/overlays/ldcVersion.nix
+++ b/nixDevEnv/overlays/ldcVersion.nix
@@ -1,9 +1,8 @@
 self: super: rec {
-  pname   = "ldc";
-  version = "1.24.0";
-  sha256  = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
   ldc = super.ldc.overrideAttrs(oldAttrs: rec {
-    inherit pname version sha256;
+    pname   = "ldc";
+    version = "1.24.0";
+    sha256  = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
     name = "${pname}-${version}";
     src = super.fetchurl {
       url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
diff --git a/nixDevEnv/shells/packages-ldc.nix b/nixDevEnv/shells/packages-ldc.nix
new file mode 100644
index 0000000..9874b74
--- /dev/null
+++ b/nixDevEnv/shells/packages-ldc.nix
@@ -0,0 +1,18 @@
+{ pkgs ? import <nixpkgs> {} }:
+let
+  dub2nix-src = fetchTarball {
+    url = "https://github.com/lionello/dub2nix/archive/master.tar.gz";
+  };
+  dub2nix = (import dub2nix-src) { inherit pkgs; };
+in
+with pkgs; [
+  nix
+  dub
+  ninja
+  ldc
+  rdmd
+  sqlite
+  dub2nix
+  nix-prefetch-git
+  validatePkgConfig
+]
diff --git a/nixDevEnv/shells/shell-dmd-verNix.nix b/nixDevEnv/shells/shell-dmd-verNix.nix
index a673c35..7f16efe 100644
--- a/nixDevEnv/shells/shell-dmd-verNix.nix
+++ b/nixDevEnv/shells/shell-dmd-verNix.nix
@@ -1,12 +1,5 @@
-{ 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 {
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
   buildInputs = with pkgs; [
     nix
     dub
diff --git a/nixDevEnv/shells/shell-dmd-verUser.nix b/nixDevEnv/shells/shell-dmd-verUser.nix
index a673c35..334aece 100644
--- a/nixDevEnv/shells/shell-dmd-verUser.nix
+++ b/nixDevEnv/shells/shell-dmd-verUser.nix
@@ -1,12 +1,7 @@
 { 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 {
+pkgs.mkShell {
   buildInputs = with pkgs; [
     nix
     dub
diff --git a/nixDevEnv/shells/shell-ldc-verNix.nix b/nixDevEnv/shells/shell-ldc-verNix.nix
index 094bfa7..0a6aa9a 100644
--- a/nixDevEnv/shells/shell-ldc-verNix.nix
+++ b/nixDevEnv/shells/shell-ldc-verNix.nix
@@ -1,19 +1,5 @@
-{ 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
-    ldc
-    rdmd
-    sqlite
-    dub2nix
-    nix-prefetch-git
-  ];
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  buildInputs = with pkgs;
+  [ (import ./packages-ldc.nix { inherit pkgs; }) ];
 }
diff --git a/nixDevEnv/shells/shell-ldc-verUser.nix b/nixDevEnv/shells/shell-ldc-verUser.nix
index 9d2c3e1..1c9c092 100644
--- a/nixDevEnv/shells/shell-ldc-verUser.nix
+++ b/nixDevEnv/shells/shell-ldc-verUser.nix
@@ -1,17 +1,7 @@
-{ pkgs ? import <nixpkgs> {}, }:
-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
-  ];
+{ pkgs ? import <nixpkgs> {
+  overlays = [ (import ../overlays/ldcVersion.nix) ];
+} }:
+pkgs.mkShell {
+  buildInputs = with pkgs;
+  [ (import ./packages-ldc.nix { inherit pkgs; }) ];
 }