mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 22:03:54 +03:00
glibc: Move 2.17 -> 2.18
This commit is contained in:
parent
fd7bc4ebfd
commit
5b22285b53
@ -4177,8 +4177,6 @@ let
|
||||
|
||||
glfw = callPackage ../development/libraries/glfw { };
|
||||
|
||||
glibcCross = glibc217Cross;
|
||||
|
||||
glibc213 = (callPackage ../development/libraries/glibc/2.13 {
|
||||
kernelHeaders = linuxHeaders;
|
||||
installLocales = config.glibc.locales or false;
|
||||
@ -4200,7 +4198,7 @@ let
|
||||
inherit fetchgit;
|
||||
}));
|
||||
|
||||
glibc = callPackage ../development/libraries/glibc/2.17 {
|
||||
glibc = callPackage ../development/libraries/glibc/2.18 {
|
||||
kernelHeaders = linuxHeaders;
|
||||
installLocales = config.glibc.locales or false;
|
||||
machHeaders = null;
|
||||
@ -4208,13 +4206,13 @@ let
|
||||
gccCross = null;
|
||||
};
|
||||
|
||||
glibc_memusage = callPackage ../development/libraries/glibc/2.17 {
|
||||
glibc_memusage = callPackage ../development/libraries/glibc/2.18 {
|
||||
kernelHeaders = linuxHeaders;
|
||||
installLocales = false;
|
||||
withGd = true;
|
||||
};
|
||||
|
||||
glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17)
|
||||
glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.18)
|
||||
(let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
|
||||
in {
|
||||
inherit stdenv fetchurl;
|
||||
@ -4243,9 +4241,9 @@ let
|
||||
installLocales = config.glibc.locales or false;
|
||||
};
|
||||
|
||||
glibcLocales = callPackage ../development/libraries/glibc/2.17/locales.nix { };
|
||||
glibcLocales = callPackage ../development/libraries/glibc/2.18/locales.nix { };
|
||||
|
||||
glibcInfo = callPackage ../development/libraries/glibc/2.17/info.nix { };
|
||||
glibcInfo = callPackage ../development/libraries/glibc/2.18/info.nix { };
|
||||
|
||||
glibc_multi =
|
||||
runCommand "${glibc.name}-multi"
|
||||
|
Loading…
Reference in New Issue
Block a user