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

glibc: remove installLocales argument

Browse Source 
Since we now install a sane default this should be no longer necessary.
If it is still needed, it should be easy enough to do this in an overlay.
This commit is contained in:
Jörg Thalheim 2019-01-22 21:14:05 +00:00
parent 2bfa8747f7
commit 5e24fccba4
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glibc/common.nix
View File

@ -28,7 +28,6 @@
{ name { name
, withLinuxHeaders ? false , withLinuxHeaders ? false
, profilingLibraries ? false , profilingLibraries ? false
, installLocales ? false
, withGd ? false , withGd ? false
, meta , meta
, ... , ...
@ -44,7 +43,7 @@ assert withLinuxHeaders -> linuxHeaders != null;
assert withGd -> gd != null && libpng != null; assert withGd -> gd != null && libpng != null;
stdenv.mkDerivation ({ stdenv.mkDerivation ({
inherit version installLocales; inherit version;
linuxHeaders = if withLinuxHeaders then linuxHeaders else null; linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
inherit (stdenv) is64bit; inherit (stdenv) is64bit;

3
pkgs/development/libraries/glibc/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, callPackage { stdenv, callPackage
, withLinuxHeaders ? true , withLinuxHeaders ? true
, installLocales ? true
, profilingLibraries ? false , profilingLibraries ? false
, withGd ? false , withGd ? false
}: }:
@ -8,7 +7,7 @@
callPackage ./common.nix { inherit stdenv; } { callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + stdenv.lib.optionalString withGd "-gd"; name = "glibc" + stdenv.lib.optionalString withGd "-gd";
inherit withLinuxHeaders profilingLibraries installLocales withGd; inherit withLinuxHeaders profilingLibraries withGd;
# Note: # Note:
# Things you write here override, and do not add to, # Things you write here override, and do not add to,

2
pkgs/development/libraries/glibc/locales.nix
View File

@ -13,8 +13,6 @@
callPackage ./common.nix { inherit stdenv; } { callPackage ./common.nix { inherit stdenv; } {
name = "glibc-locales"; name = "glibc-locales";
installLocales = true;
builder = ./locales-builder.sh; builder = ./locales-builder.sh;
outputs = [ "out" ]; outputs = [ "out" ];

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

@ -9955,9 +9955,7 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
}; };
glibc = callPackage ../development/libraries/glibc { glibc = callPackage ../development/libraries/glibc { };
installLocales = config.glibc.locales or false;
};
# Provided by libc on Operating Systems that use the Extensible Linker Format. # Provided by libc on Operating Systems that use the Extensible Linker Format.
elf-header = elf-header =
@ -9968,13 +9966,11 @@ in
elf-header-real = callPackage ../development/libraries/elf-header { }; elf-header-real = callPackage ../development/libraries/elf-header { };
glibc_memusage = callPackage ../development/libraries/glibc { glibc_memusage = callPackage ../development/libraries/glibc {
installLocales = false;
withGd = true; withGd = true;
}; };
# Being redundant to avoid cycles on boot. TODO: find a better way # Being redundant to avoid cycles on boot. TODO: find a better way
glibcCross = callPackage ../development/libraries/glibc { glibcCross = callPackage ../development/libraries/glibc {
installLocales = config.glibc.locales or false;
stdenv = crossLibcStdenv; stdenv = crossLibcStdenv;
}; };