dtools: 2.085.1 -> 2.095.1
This commit is contained in:
parent
4b68e4f968
commit
45f3a999d0
|
@ -1,22 +1,22 @@
|
||||||
{stdenv, lib, fetchFromGitHub, dmd, curl}:
|
{stdenv, lib, fetchFromGitHub, ldc, curl}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dtools";
|
pname = "dtools";
|
||||||
version = "2.085.1";
|
version = "2.095.1";
|
||||||
|
|
||||||
srcs = [
|
srcs = [
|
||||||
(fetchFromGitHub {
|
(fetchFromGitHub {
|
||||||
owner = "dlang";
|
owner = "dlang";
|
||||||
repo = "dmd";
|
repo = "dmd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
|
sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
|
||||||
name = "dmd";
|
name = "dmd";
|
||||||
})
|
})
|
||||||
(fetchFromGitHub {
|
(fetchFromGitHub {
|
||||||
owner = "dlang";
|
owner = "dlang";
|
||||||
repo = "tools";
|
repo = "tools";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
|
sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
|
||||||
name = "dtools";
|
name = "dtools";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
|
||||||
mv dmd dtools
|
mv dmd dtools
|
||||||
cd dtools
|
cd dtools
|
||||||
|
|
||||||
substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ dmd ];
|
nativeBuildInputs = [ ldc ];
|
||||||
buildInputs = [ curl ];
|
buildInputs = [ curl ];
|
||||||
|
|
||||||
makeCmd = ''
|
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 = ''
|
buildPhase = ''
|
||||||
|
|
Loading…
Reference in a new issue