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

GCC 4.4: Don't expect zlib when `langJava' is false.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16518
This commit is contained in:
Ludovic Courtès 2009-07-30 10:31:04 +00:00
parent b0e71363d1
commit 33c6204f95
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -125,15 +125,13 @@ stdenv.mkDerivation ({
CPATH = concatStrings CPATH = concatStrings
(intersperse ":" (map (x: x + "/include") (intersperse ":" (map (x: x + "/include")
([ zlib ] (optionals langJava [ boehmgc zlib ]
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]))); ++ optionals javaAwtGtk [ gmp mpfr ])));
LIBRARY_PATH = concatStrings LIBRARY_PATH = concatStrings
(intersperse ":" (map (x: x + "/lib") (intersperse ":" (map (x: x + "/lib")
([ zlib ] (optionals langJava [ boehmgc zlib ]
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]))); ++ optionals javaAwtGtk [ gmp mpfr ])));