From 33c6204f9567dede3f012dff4bde2b98cb937d1f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Jul 2009 10:31:04 +0000 Subject: GCC 4.4: Don't expect zlib when `langJava' is false. svn path=/nixpkgs/trunk/; revision=16518 --- pkgs/development/compilers/gcc-4.4/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/development/compilers/gcc-4.4') 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 ]))); -- cgit 1.4.1