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

Revert stdenv glibc back to version 2.13.

Browse Source 
Note that I didn't touch the glibcCross attribute! That still points to glibc 2.14.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30031
This commit is contained in:
Peter Simons 2011-10-26 10:48:55 +00:00
parent 51e5c3b73d
commit 3590b859c5
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3401,7 +3401,9 @@ let
glfw = callPackage ../development/libraries/glfw { };
glibc = glibc214;
glibc = glibc213;
glibcCross = glibc214Cross;
glibc25 = callPackage ../development/libraries/glibc-2.5 {
kernelHeaders = linuxHeaders_2_6_28;
@ -3425,6 +3427,29 @@ let
installLocales = getConfig [ "glibc" "locales" ] false;
});
glibc213 = (callPackage ../development/libraries/glibc-2.13 {
kernelHeaders = linuxHeaders;
installLocales = getConfig [ "glibc" "locales" ] false;
machHeaders = null;
hurdHeaders = null;
gccCross = null;
}) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {});
glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13)
(let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu");
in ({
inherit stdenv fetchurl;
gccCross = gccCrossStageStatic;
kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross;
installLocales = getConfig [ "glibc" "locales" ] false;
}
//
(if crossGNU
then { inherit machHeaders hurdHeaders mig fetchgit; }
else { }))));
glibc214 = (callPackage ../development/libraries/glibc-2.14 {
kernelHeaders = linuxHeaders;
installLocales = getConfig [ "glibc" "locales" ] false;
@ -3448,8 +3473,6 @@ let
then { inherit machHeaders hurdHeaders mig fetchgit; }
else { }))));
glibcCross = glibc214Cross;
# We can choose:
libcCrossChooser = name : if (name == "glibc") then glibcCross
else if (name == "uclibc") then uclibcCross