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

Removing unneeded changes in stdenvLinux, for the pi.

Browse Source 
I had those changes from the time when I wanted to bootstrap
its stdenvLinux from armv5tel bootstrap-tools. But that
never worked.
This commit is contained in:
Lluís Batlle i Rossell 2012-12-27 15:19:23 +00:00
parent c41881842b
commit ee2f05d683
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/stdenv/linux/default.nix
View File

@ -203,23 +203,19 @@ rec {
coreutils = bootstrapTools; coreutils = bootstrapTools;
libc = stdenvLinuxGlibc; libc = stdenvLinuxGlibc;
}; };
overrides = pkgs: ({ overrides = pkgs: {
glibc = stdenvLinuxGlibc; glibc = stdenvLinuxGlibc;
inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stdenvLinuxBoot1Pkgs) perl;
} // (if (platform ? name && platform.name != "raspberrypi") then {
# Link GCC statically against GMP etc. This makes sense because # Link GCC statically against GMP etc. This makes sense because
# these builds of the libraries are only used by GCC, so it # these builds of the libraries are only used by GCC, so it
# reduces the size of the stdenv closure. # reduces the size of the stdenv closure.
# On raspberry pi we can't do that, because libgcc/libstdc++ are made
# without hardfp, and can't be linked with the new hardfp code in gcc.
gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
} else {})); };
inherit fetchurl; inherit fetchurl;
}; };
@ -240,8 +236,7 @@ rec {
inherit (stdenvLinuxBoot3Pkgs) binutils; inherit (stdenvLinuxBoot3Pkgs) binutils;
coreutils = bootstrapTools; coreutils = bootstrapTools;
libc = stdenvLinuxGlibc; libc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot3Pkgs.gcc.gcc.override (if platform.name == "raspberrypi" then gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
{ ppl = null; cloog = null; } else {});
name = ""; name = "";
}; };
extraPath = [ stdenvLinuxBoot3Pkgs.xz ]; extraPath = [ stdenvLinuxBoot3Pkgs.xz ];