diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f08bcc3c6474..f1c2953a4b77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3417,7 +3417,9 @@ let let haveRedHatKernel = system == "i686-linux" || system == "x86_64-linux"; haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false; in - useFromStdenv "glibc" (if haveBrokenRedHatKernel then glibc25 else glibc211); + useFromStdenv "glibc" (if haveBrokenRedHatKernel then glibc25 else + # glibc211 does not have ports still. + if (system == "armv5tel-linux") then glibc210 else glibc211); glibc25 = import ../development/libraries/glibc-2.5 { inherit fetchurl stdenv kernelHeaders; @@ -3443,6 +3445,11 @@ let glibcCross = cross: glibc29Cross cross; + glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) { + inherit fetchurl stdenv kernelHeaders; + installLocales = getPkgConfig "glibc" "locales" false; + }; + glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) { inherit fetchurl stdenv kernelHeaders; installLocales = getPkgConfig "glibc" "locales" false; @@ -3462,7 +3469,7 @@ let installLocales = getPkgConfig "glibc" "locales" false; }; - glibcLocales = makeOverridable (import ../development/libraries/glibc-2.11/locales.nix) { + glibcLocales = makeOverridable (import ../development/libraries/glibc-2.10/locales.nix) { inherit fetchurl stdenv; }; |