diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 21:14:38 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:04:41 +0200 |
| commit | e254750560ed703de844b6d7390e56914b59dbed (patch) | |
| tree | ba78aeee8de183117550d3198f4b7135b1d281e7 /pkgs/development/compilers/gcc/5 | |
| parent | 1819181726ef39d30684718f617c1fb1b47d471c (diff) | |
| download | nixlib-e254750560ed703de844b6d7390e56914b59dbed.tar nixlib-e254750560ed703de844b6d7390e56914b59dbed.tar.gz nixlib-e254750560ed703de844b6d7390e56914b59dbed.tar.bz2 nixlib-e254750560ed703de844b6d7390e56914b59dbed.tar.lz nixlib-e254750560ed703de844b6d7390e56914b59dbed.tar.xz nixlib-e254750560ed703de844b6d7390e56914b59dbed.tar.zst nixlib-e254750560ed703de844b6d7390e56914b59dbed.zip | |
GCC: explicitly use some dev outputs
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 7db517bd5548..9e0220ffc728 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -242,7 +242,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -460,7 +460,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs |