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

glibc: making 2.17 the glibc to use cross-building.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-29 15:08:18 +01:00
parent 01acc493ca
commit 829bdc1cb0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3663,7 +3663,7 @@ let
glibc = glibc217; glibc = glibc217;
glibcCross = glibc213Cross; glibcCross = glibc217Cross;
glibc213 = (callPackage ../development/libraries/glibc/2.13 { glibc213 = (callPackage ../development/libraries/glibc/2.13 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
@ -3673,7 +3673,15 @@ let
gccCross = null; gccCross = null;
}) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {}); }) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {});
glibc213Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.13) glibc217 = callPackage ../development/libraries/glibc/2.17 {
kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false;
machHeaders = null;
hurdHeaders = null;
gccCross = null;
};
glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17)
(let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
in { in {
inherit stdenv fetchurl; inherit stdenv fetchurl;
@ -3686,13 +3694,6 @@ let
inherit fetchgit; inherit fetchgit;
})); }));
glibc217 = callPackage ../development/libraries/glibc/2.17 {
kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false;
machHeaders = null;
hurdHeaders = null;
gccCross = null;
};
# We can choose: # We can choose:
libcCrossChooser = name : if name == "glibc" then glibcCross libcCrossChooser = name : if name == "glibc" then glibcCross