From e85e73bbc8ebcfcb9415aca8bd929f8b672a82de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 16:42:51 +0000 Subject: [PATCH] =?UTF-8?q?*=20Operator=20precendence=20kills=20:-)=20=20G?= =?UTF-8?q?CC=20was=20accidentally=20depending=20on=20=20=20X11=20because?= =?UTF-8?q?=20of=20missing=20parentheses=20around=20a=20=E2=80=98++?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30060 --- pkgs/development/compilers/gcc-4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index c28b885c680..48b147fc863 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) + ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat])