JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Backport the GCC xlibs dependency fix.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30061
This commit is contained in:
Eelco Dolstra 2011-10-27 16:50:00 +00:00
parent e85e73bbc8
commit 3cb8791cf9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/scripts/eval-release.nix
View File

@ -16,7 +16,7 @@ let
call = attrs: lib.flip lib.mapAttrs attrs
(n: v: builtins.trace n (
if builtins.isFunction v then maybe (v { system = "i686-linux"; })
if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
else if builtins.isAttrs v then call v
else null
));

2
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -132,7 +132,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [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])

2
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -204,7 +204,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [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])