Author: ludo
Date: Wed Apr 6 12:52:29 2011
New Revision: 26713
URL: https://svn.nixos.org/websvn/nix/?rev=26713&sc=1
Log:
GCC 4.6: Use `callPackage'.
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Wed Apr
6 11:58:13 2011 (r26712)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Wed Apr
6 12:52:29 2011 (r26713)
@@ -203,16 +203,15 @@
libcCross crossMingw;
buildNativeInputs = [ texinfo which ]
- ++ optional (perl != null) perl;
-
+ ++ optional langJava perl;
+
buildInputs = [ gmp mpfr mpc libelf gettext ]
++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl)
++ (optional (cloog != null) cloog)
++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib)
- ++ (optional (boehmgc != null) boehmgc)
- ++ (optionals langJava [zip unzip])
+ ++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 6 11:58:13
2011 (r26712)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 6 12:52:29
2011 (r26713)
@@ -1733,11 +1733,15 @@
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else
true;
}));
- gcc46_real = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc-4.6) {
- inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
- cloog gettext which noSysDirs;
+ gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
+ inherit noSysDirs;
+ cross = null;
+ libcCross = null;
+ binutilsCross = null;
+
ppl = ppl0_11;
-
+ cloogppl = null;
+
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else
true;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
