diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-30 10:31:04 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-30 10:31:04 +0000 |
| commit | 33c6204f9567dede3f012dff4bde2b98cb937d1f (patch) | |
| tree | 0059e698089ec4c514e71f7fd6612eaf26e762d2 /pkgs/development/compilers/gcc-4.4 | |
| parent | b0e71363d1d8bbc7e95c88020d543062b55e1ec8 (diff) | |
| download | nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.tar nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.tar.gz nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.tar.bz2 nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.tar.lz nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.tar.xz nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.tar.zst nixlib-33c6204f9567dede3f012dff4bde2b98cb937d1f.zip | |
GCC 4.4: Don't expect zlib when `langJava' is false.
svn path=/nixpkgs/trunk/; revision=16518
Diffstat (limited to 'pkgs/development/compilers/gcc-4.4')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index fb9bcb8d031b..b5d715c3f87a 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -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 ]))); |