@@ -1,4 +1,6 @@
1−{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
1+{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
2+
3+assert dcompiler != null;
24
35stdenv.mkDerivation rec {
46 pname = "dub";
@@ -24,12 +26,23 @@ stdenv.mkDerivation rec {
2426 --replace "dub remove" "\"${dubvar}\" remove"
2527 '';
2628
27− nativeBuildInputs = [ dmd libevent rsync ];
29+ nativeBuildInputs = [ dcompiler libevent rsync ];
2830 buildInputs = [ curl ];
2931
3032 buildPhase = ''
31− export DMD=${dmd.out}/bin/dmd
32− ./build.sh
33+ for dc_ in dmd ldmd2 gdmd; do
34+ echo "... check for D compiler $dc_ ..."
35+ dc=$(type -P $dc_ || echo "")
36+ if [ ! "$dc" == "" ]; then
37+ break
38+ fi
39+ done
40+ if [ "$dc" == "" ]; then
41+ exit "Error: could not find D compiler"
42+ fi
43+ echo "$dc_ found and used as D compiler to build $pname"
44+ $dc ./build.d
45+ ./build
3346 '';
3447
3548 doCheck = !stdenv.isDarwin;
@@ -37,7 +50,8 @@ stdenv.mkDerivation rec {
3750 checkPhase = ''
3851 export DUB=$NIX_BUILD_TOP/source/bin/dub
3952 export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
40− export DC=${dmd.out}/bin/dmd
53+ export DC=${dcompiler.out}/bin/${dcompiler.pname}
54+ echo "DC out --> $DC"
4155 export HOME=$TMP
4256
4357 rm -rf test/issue502-root-import
@@ -46,7 +60,6 @@ stdenv.mkDerivation rec {
4660 rm test/issue990-download-optional-selected.sh
4761 rm test/issue877-auto-fetch-package-on-run.sh
4862 rm test/issue1037-better-dependency-messages.sh
49− rm test/issue1040-run-with-ver.sh
5063 rm test/issue1416-maven-repo-pkg-supplier.sh
5164 rm test/issue1180-local-cache-broken.sh
5265 rm test/issue1574-addcommand.sh
@@ -62,13 +75,73 @@ stdenv.mkDerivation rec {
6275 rm test/version-spec.sh
6376 rm test/0-init-multi.sh
6477 rm test/0-init-multi-json.sh
78+ rm test/4-describe-data-1-list.sh
79+ rm test/4-describe-data-3-zero-delim.sh
80+ rm test/4-describe-import-paths.sh
81+ rm test/4-describe-string-import-paths.sh
82+ rm test/4-describe-json.sh
83+ rm test/5-convert-stdout.sh
84+ rm test/issue1003-check-empty-ld-flags.sh
85+ rm test/issue103-single-file-package.sh
86+ rm test/issue1040-run-with-ver.sh
87+ rm test/issue1091-bogus-rebuild.sh
88+ rm test/issue1194-warn-wrong-subconfig.sh
89+ rm test/issue1277.sh
90+ rm test/issue1372-ignore-files-in-hidden-dirs.sh
91+ rm test/issue1447-build-settings-vars.sh
92+ rm test/issue1531-toolchain-requirements.sh
93+ rm test/issue346-redundant-flags.sh
94+ rm test/issue361-optional-deps.sh
95+ rm test/issue564-invalid-upgrade-dependency.sh
96+ rm test/issue586-subpack-dep.sh
97+ rm test/issue616-describe-vs-generate-commands.sh
98+ rm test/issue686-multiple-march.sh
99+ rm test/issue813-fixed-dependency.sh
100+ rm test/issue813-pure-sub-dependency.sh
101+ rm test/issue820-extra-fields-after-convert.sh
102+ rm test/issue923-subpackage-deps.sh
103+ rm test/single-file-sdl-default-name.sh
104+ rm test/subpackage-common-with-sourcefile-globbing.sh
105+ rm test/issue934-path-dep.sh
106+ rm -r test/1-dynLib-simple
107+ rm -r test/1-exec-simple-package-json
108+ rm -r test/1-exec-simple
109+ rm -r test/1-staticLib-simple
110+ rm -r test/2-dynLib-dep
111+ rm -r test/2-staticLib-dep
112+ rm -r test/2-dynLib-with-staticLib-dep
113+ rm -r test/2-sourceLib-dep/
114+ rm -r test/3-copyFiles
115+ rm -r test/custom-source-main-bug487
116+ rm -r test/custom-unittest
117+ rm -r test/issue1262-version-inheritance-diamond
118+ rm -r test/issue1003-check-empty-ld-flags
119+ rm -r test/ignore-hidden-1
120+ rm -r test/ignore-hidden-2
121+ rm -r test/issue1427-betterC
122+ rm -r test/issue130-unicode-*
123+ rm -r test/issue1262-version-inheritance
124+ rm -r test/issue1372-ignore-files-in-hidden-dirs
125+ rm -r test/issue1350-transitive-none-deps
126+ rm -r test/issue1775
127+ rm -r test/issue1447-build-settings-vars
128+ rm -r test/issue1408-inherit-linker-files
129+ rm -r test/issue1551-var-escaping
130+ rm -r test/issue754-path-selection-fail
131+ rm -r test/issue1788-incomplete-string-import-override
132+ rm -r test/subpackage-ref
133+ rm -r test/issue777-bogus-path-dependency
134+ rm -r test/issue959-path-based-subpack-dep
135+ rm -r test/issue97-targettype-none-nodeps
136+ rm -r test/issue97-targettype-none-onerecipe
137+ rm -r test/path-subpackage-ref
138+ rm -r test/sdl-package-simple
65139
66140 ./test/run-unittest.sh
67141 '';
68142
69143 installPhase = ''
70− mkdir $out
71− mkdir $out/bin
144+ mkdir -p $out/bin
72145 cp bin/dub $out/bin
73146 '';
74147