Create a ppl0_11 attribute instead of using callPackage again and again

svn path=/nixpkgs/trunk/; revision=26703
This commit is contained in:
Shea Levy 2011-04-05 17:11:20 +00:00
parent 76610988f8
commit 85e1282802

View File

@ -1118,6 +1118,8 @@ let
ppl = callPackage ../development/libraries/ppl { }; ppl = callPackage ../development/libraries/ppl { };
ppl0_11 = callPackage ../development/libraries/ppl/0.11.nix { };
/* WARNING: this version is unsuitable for using with a setuid wrapper */ /* WARNING: this version is unsuitable for using with a setuid wrapper */
ppp = builderDefsPackage (import ../tools/networking/ppp) { ppp = builderDefsPackage (import ../tools/networking/ppp) {
}; };
@ -1661,7 +1663,7 @@ let
(makeOverridable (import ../development/compilers/gcc-4.6) { (makeOverridable (import ../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog gettext which noSysDirs; cloog gettext which noSysDirs;
ppl = callPackage ../development/libraries/ppl/0.11.nix { }; ppl = ppl0_11;
binutilsCross = binutilsCross; binutilsCross = binutilsCross;
libcCross = libcCross; libcCross = libcCross;
profiledCompiler = false; profiledCompiler = false;
@ -1734,7 +1736,7 @@ let
gcc46_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.6) { gcc46_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
cloog gettext which noSysDirs; cloog gettext which noSysDirs;
ppl = callPackage ../development/libraries/ppl/0.11.nix { }; ppl = ppl0_11;
# 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