* Operator precendence kills :-) GCC was accidentally depending on

X11 because of missing parentheses around a ‘++’.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30060
This commit is contained in:
Eelco Dolstra 2011-10-27 16:42:51 +00:00
parent fd394a7c4a
commit e85e73bbc8

View File

@ -209,7 +209,7 @@ stdenv.mkDerivation ({
++ (optional (cloog != null) cloog) ++ (optional (cloog != null) cloog)
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
++ (optionals (cross != null) [binutilsCross]) ++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot]) ++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat]) ++ (optionals langVhdl [gnat])