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

GCC 4.6: Use `callPackage'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=26713
This commit is contained in:
Ludovic Courtès 2011-04-06 12:52:29 +00:00
parent 20a5c4d74a
commit 36ed7a8eb8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/gcc-4.6/default.nix
View File

@ -203,16 +203,15 @@ stdenv.mkDerivation ({
libcCross crossMingw; libcCross crossMingw;
buildNativeInputs = [ texinfo which ] buildNativeInputs = [ texinfo which ]
++ optional (perl != null) perl; ++ optional langJava perl;
buildInputs = [ gmp mpfr mpc libelf gettext ] buildInputs = [ gmp mpfr mpc libelf gettext ]
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
++ (optional (cloog != null) cloog) ++ (optional (cloog != null) cloog)
++ (optionals langTreelang [bison flex]) ++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals langJava [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])

12
pkgs/top-level/all-packages.nix
View File

@ -1733,11 +1733,15 @@ let
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
})); }));
gcc46_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.6) { gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl inherit noSysDirs;
cloog gettext which noSysDirs; cross = null;
libcCross = null;
binutilsCross = null;
ppl = ppl0_11; ppl = ppl0_11;
cloogppl = null;
# bootstrapping a profiled compiler does not work in the sheevaplug: # bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;