Author: eelco
Date: Thu Oct 27 16:50:00 2011
New Revision: 30061
URL: https://nixos.org/websvn/nix/?rev=30061&sc=1
Log:
* Backport the GCC xlibs dependency fix.
Modified:
nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Modified: nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
Thu Oct 27 16:42:51 2011 (r30060)
+++ nixpkgs/branches/stdenv-updates/maintainers/scripts/eval-release.nix
Thu Oct 27 16:50:00 2011 (r30061)
@@ -16,7 +16,7 @@
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
));
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Thu Oct 27 16:42:51 2011 (r30060)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Thu Oct 27 16:50:00 2011 (r30061)
@@ -132,7 +132,7 @@
++ (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])
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Thu Oct 27 16:42:51 2011 (r30060)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Thu Oct 27 16:50:00 2011 (r30061)
@@ -204,7 +204,7 @@
++ (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])
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
