Merge pull request #32481 from ThomasMader/dlang

dmd, ldc, dub: Inherit buildInput and meta from build derivation
This commit is contained in:
Joachim F 2017-12-08 23:50:33 +00:00 committed by GitHub
commit f5f6d8e393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions

View File

@ -278,10 +278,12 @@ stdenv.mkDerivation rec {
inherit phobosUnittests; inherit phobosUnittests;
name = "dmd-${version}"; name = "dmd-${version}";
phases = "installPhase"; phases = "installPhase";
buildInputs = dmdBuild.buildInputs;
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r --symbolic-link ${dmdBuild}/* $out/ cp -r --symbolic-link ${dmdBuild}/* $out/
''; '';
meta = dmdBuild.meta;
} }

View File

@ -249,10 +249,13 @@ stdenv.mkDerivation rec {
inherit ldcUnittests; inherit ldcUnittests;
name = "ldc-${version}"; name = "ldc-${version}";
phases = "installPhase"; phases = "installPhase";
buildInputs = ldcBuild.buildInputs;
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r --symbolic-link ${ldcBuild}/* $out/ cp -r --symbolic-link ${ldcBuild}/* $out/
''; '';
meta = ldcBuild.meta;
} }

View File

@ -87,10 +87,13 @@ stdenv.mkDerivation rec {
inherit dubUnittests; inherit dubUnittests;
name = "dub-${dubBuild.version}"; name = "dub-${dubBuild.version}";
phases = "installPhase"; phases = "installPhase";
buildInputs = dubBuild.buildInputs;
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r --symbolic-link ${dubBuild}/* $out/ cp -r --symbolic-link ${dubBuild}/* $out/
''; '';
meta = dubBuild.meta;
} }