summary refs log tree commit diff
path: root/pkgs/development/tools/dtools
diff options
context:
space:
mode:
authorThomas Mader <thomas.mader@gmail.com>2018-02-10 10:49:17 +0100
committerThomas Mader <thomas.mader@gmail.com>2018-02-10 10:49:17 +0100
commita1f920e900c71c9800d00cac7b3a14940a1037d0 (patch)
tree7f0a58525c9a4f41209992b791ce738f06053df7 /pkgs/development/tools/dtools
parent95e86ba6517bc977e5d2f7df15bf9c4ed2bf0d67 (diff)
downloadnixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.tar
nixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.tar.gz
nixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.tar.bz2
nixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.tar.lz
nixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.tar.xz
nixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.tar.zst
nixpkgs-a1f920e900c71c9800d00cac7b3a14940a1037d0.zip
dtools: 2.078.1 -> 2.078.2
Diffstat (limited to 'pkgs/development/tools/dtools')
-rw-r--r--pkgs/development/tools/dtools/default.nix18
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index daa25de9508..d76bbb7f53a 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "dtools-${version}";
-  version = "2.078.1";
+  version = "2.078.2";
 
   srcs = [
     (fetchFromGitHub {
       owner = "dlang";
       repo = "dmd";
       rev = "v${version}";
-      sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2";
+      sha256 = "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls";
       name = "dmd";
     })
     (fetchFromGitHub {
@@ -28,23 +28,11 @@ stdenv.mkDerivation rec {
       cd dtools
   '';
 
-  postPatch = ''
-      substituteInPlace posix.mak \
-          --replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd
-
-      substituteInPlace posix.mak \
-          --replace gcc $CC
-
-      # To fix rdmd test with newer phobos
-      substituteInPlace rdmd.d \
-          --replace " std.stdiobase," ""
-  '';
-
   nativeBuildInputs = [ dmd ];
   buildInputs = [ curl ];
 
   makeCmd = ''
-    make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd
+    make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
   '';
 
   buildPhase = ''