mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
glibc/2.19 -> glibc
We only have one version of Glibc so no need for a separate directory.
This commit is contained in:
parent
2ee8b30b64
commit
1b55b07eeb
@ -5072,7 +5072,7 @@ let
|
||||
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
|
||||
glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
|
||||
|
||||
glibc = callPackage ../development/libraries/glibc/2.19 {
|
||||
glibc = callPackage ../development/libraries/glibc {
|
||||
kernelHeaders = linuxHeaders;
|
||||
installLocales = config.glibc.locales or false;
|
||||
machHeaders = null;
|
||||
@ -5080,13 +5080,13 @@ let
|
||||
gccCross = null;
|
||||
};
|
||||
|
||||
glibc_memusage = callPackage ../development/libraries/glibc/2.19 {
|
||||
glibc_memusage = callPackage ../development/libraries/glibc {
|
||||
kernelHeaders = linuxHeaders;
|
||||
installLocales = false;
|
||||
withGd = true;
|
||||
};
|
||||
|
||||
glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19)
|
||||
glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc)
|
||||
(let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
|
||||
in {
|
||||
inherit stdenv fetchurl;
|
||||
@ -5114,11 +5114,11 @@ let
|
||||
installLocales = config.glibc.locales or false;
|
||||
};
|
||||
|
||||
glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { };
|
||||
glibcLocales = callPackage ../development/libraries/glibc/locales.nix { };
|
||||
|
||||
glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
|
||||
glibcInfo = callPackage ../development/libraries/glibc/info.nix { };
|
||||
|
||||
glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix {
|
||||
glibc_multi = callPackage ../development/libraries/glibc/multi.nix {
|
||||
inherit glibc;
|
||||
glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user