alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

dtools: 2.085.1 -> 2.095.1

Browse source
This commit is contained in:
Thomas Mader 2021-03-06 16:43:24 +01:00 • committed by adisbladis
parent 4b68e4f968
commit 45f3a999d0
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
1 changed files with 6 additions and 7 deletions

13
pkgs/development/tools/dtools/default.nix
View file

@ -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 = ''