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