diff options
| author | Thomas Mader <thomas.mader@gmail.com> | 2019-02-22 19:02:56 +0100 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-02-22 14:53:56 -0500 |
| commit | 386a760cfa230bc261be2930522f4614f5f0b95d (patch) | |
| tree | f3b7f2d94caa3f5da16248826f9fc17d3d9d8543 | |
| parent | c0318efe9ac76f6a18e41eacfa879e24c87f30e4 (diff) | |
| download | nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.tar nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.tar.gz nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.tar.bz2 nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.tar.lz nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.tar.xz nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.tar.zst nixlib-386a760cfa230bc261be2930522f4614f5f0b95d.zip | |
dmd: Fix dmd.conf
| -rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 6130608062d0..a9f0e3ec0a51 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -14,7 +14,7 @@ let name = "dmd.conf"; text = (lib.generators.toINI {} { "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 mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 + mkdir $out/include/dmd + cp -r import/* $out/include/dmd cd ../phobos mkdir $out/lib cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - cp -r std $out/include/d2 - cp -r etc $out/include/d2 + cp -r std $out/include/dmd + cp -r etc $out/include/dmd wrapProgram $out/bin/dmd \ --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ |