From a1f920e900c71c9800d00cac7b3a14940a1037d0 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 10 Feb 2018 10:49:17 +0100 Subject: [PATCH] dtools: 2.078.1 -> 2.078.2 --- pkgs/development/tools/dtools/default.nix | 18 +++--------------- 1 file 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 = ''