mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues 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
(intersperse ":" (map (x: x + "/include")
([ zlib ]
++ optional langJava boehmgc
(optionals langJava [ boehmgc zlib ]
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ])));
LIBRARY_PATH = concatStrings
(intersperse ":" (map (x: x + "/lib")
([ zlib ]
++ optional langJava boehmgc
(optionals langJava [ boehmgc zlib ]
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ])));