public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dmd: Fix dmd.conf

This commit is contained in:
Thomas Mader 2019-02-22 19:02:56 +01:00 committed by Dmitry Kalinkin
parent c0318efe9a
commit 386a760cfa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/dmd/default.nix
View File

@ -14,7 +14,7 @@ let
name = "dmd.conf"; name = "dmd.conf";
text = (lib.generators.toINI {} { text = (lib.generators.toINI {} {
"Environment" = { "Environment" = {
DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
}; };
}); });
}; };
@ -135,15 +135,15 @@ stdenv.mkDerivation rec {
cd ../druntime cd ../druntime
mkdir $out/include mkdir $out/include
mkdir $out/include/d2 mkdir $out/include/dmd
cp -r import/* $out/include/d2 cp -r import/* $out/include/dmd
cd ../phobos cd ../phobos
mkdir $out/lib mkdir $out/lib
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
cp -r std $out/include/d2 cp -r std $out/include/dmd
cp -r etc $out/include/d2 cp -r etc $out/include/dmd
wrapProgram $out/bin/dmd \ wrapProgram $out/bin/dmd \
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \