diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-12-08 23:50:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 23:50:33 +0000 |
| commit | f5f6d8e39376361f16b086befae45371c372be47 (patch) | |
| tree | 0b881f2a202e44130b263023c7372285dcdb1fac | |
| parent | 9e475320fca3290dca7a35475e290feef662dab6 (diff) | |
| parent | b2e76afa992fb4b42702287df652735ed934dc2e (diff) | |
| download | nixlib-f5f6d8e39376361f16b086befae45371c372be47.tar nixlib-f5f6d8e39376361f16b086befae45371c372be47.tar.gz nixlib-f5f6d8e39376361f16b086befae45371c372be47.tar.bz2 nixlib-f5f6d8e39376361f16b086befae45371c372be47.tar.lz nixlib-f5f6d8e39376361f16b086befae45371c372be47.tar.xz nixlib-f5f6d8e39376361f16b086befae45371c372be47.tar.zst nixlib-f5f6d8e39376361f16b086befae45371c372be47.zip | |
Merge pull request #32481 from ThomasMader/dlang
dmd, ldc, dub: Inherit buildInput and meta from build derivation
| -rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ldc/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/dub/default.nix | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index d20d2a7e8ed9..875e60dd6dc5 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -278,10 +278,12 @@ stdenv.mkDerivation rec { inherit phobosUnittests; name = "dmd-${version}"; phases = "installPhase"; + buildInputs = dmdBuild.buildInputs; installPhase = '' mkdir $out cp -r --symbolic-link ${dmdBuild}/* $out/ ''; + meta = dmdBuild.meta; } diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 154da0707f67..73d798bb66fd 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -249,10 +249,13 @@ stdenv.mkDerivation rec { inherit ldcUnittests; name = "ldc-${version}"; phases = "installPhase"; + buildInputs = ldcBuild.buildInputs; installPhase = '' mkdir $out cp -r --symbolic-link ${ldcBuild}/* $out/ ''; + + meta = ldcBuild.meta; } diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 89996b3d30dc..15e801c1dffa 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -87,10 +87,13 @@ stdenv.mkDerivation rec { inherit dubUnittests; name = "dub-${dubBuild.version}"; phases = "installPhase"; + buildInputs = dubBuild.buildInputs; installPhase = '' mkdir $out cp -r --symbolic-link ${dubBuild}/* $out/ ''; + + meta = dubBuild.meta; } |