Author: ludo Date: Mon Feb 27 17:22:27 2012 New Revision: 32620 URL: https://nixos.org/websvn/nix/?rev=32620&sc=1
Log: GCC 4.6: Fix erroneous dependency on X libraries when !javaAwtGtk. Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Mon Feb 27 16:45:35 2012 (r32619) +++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Mon Feb 27 17:22:27 2012 (r32620) @@ -223,7 +223,7 @@ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk [ gtk libart_lgpl ] ++ xlibs) + ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits