about summary refs log tree commit diff
path: root/pkgs/development/tools/dtools
diff options
context:
space:
mode:
authorThomas Mader <thomas.mader@gmail.com>2021-03-06 16:43:24 +0100
committeradisbladis <adisbladis@gmail.com>2021-03-18 17:29:49 +0200
commit45f3a999d03f304f5269c9955b9843e3cdbca370 (patch)
tree71f9e2c3d046a2414c3870e923ecd927e0ca435c /pkgs/development/tools/dtools
parent4b68e4f968191151458f948b0a9ad1c5fbf3c2d5 (diff)
downloadnixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.tar
nixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.tar.gz
nixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.tar.bz2
nixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.tar.lz
nixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.tar.xz
nixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.tar.zst
nixlib-45f3a999d03f304f5269c9955b9843e3cdbca370.zip
dtools: 2.085.1 -> 2.095.1
Diffstat (limited to 'pkgs/development/tools/dtools')
-rw-r--r--pkgs/development/tools/dtools/default.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index 1c1604db654a..7a994df51b40 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -1,22 +1,22 @@
-{stdenv, lib, fetchFromGitHub, dmd, curl}:
+{stdenv, lib, fetchFromGitHub, ldc, curl}:
 
 stdenv.mkDerivation rec {
   pname = "dtools";
-  version = "2.085.1";
+  version = "2.095.1";
 
   srcs = [
     (fetchFromGitHub {
       owner = "dlang";
       repo = "dmd";
       rev = "v${version}";
-      sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
+      sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
       name = "dmd";
     })
     (fetchFromGitHub {
       owner = "dlang";
       repo = "tools";
       rev = "v${version}";
-      sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
+      sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
       name = "dtools";
     })
   ];
@@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
       mv dmd dtools
       cd dtools
 
-      substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
   '';
 
-  nativeBuildInputs = [ dmd ];
+  nativeBuildInputs = [ ldc ];
   buildInputs = [ curl ];
 
   makeCmd = ''
-    make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
+    make -f posix.mak all DMD_DIR=dmd DMD=${ldc.out}/bin/ldmd2 CC=${stdenv.cc}/bin/cc
   '';
 
   buildPhase = ''