glibc: remove installLocales argument

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 22:08:30 +00:00
parent 2bfa8747f7
commit 5e24fccba4
4 changed files with 3 additions and 11 deletions
+1 -2
View File
@@ -28,7 +28,6 @@
{ name
, withLinuxHeaders ? false
, profilingLibraries ? false
, installLocales ? false
, withGd ? false
, meta
, ...
@@ -44,7 +43,7 @@ assert withLinuxHeaders -> linuxHeaders != null;
assert withGd -> gd != null && libpng != null;
stdenv.mkDerivation ({
inherit version installLocales;
inherit version;
linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
inherit (stdenv) is64bit;
+1 -2
View File
@@ -1,6 +1,5 @@
{ stdenv, callPackage
, withLinuxHeaders ? true
, installLocales ? true
, profilingLibraries ? false
, withGd ? false
}:
@@ -8,7 +7,7 @@
callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
inherit withLinuxHeaders profilingLibraries installLocales withGd;
inherit withLinuxHeaders profilingLibraries withGd;
# Note:
# Things you write here override, and do not add to,
@@ -13,8 +13,6 @@
callPackage ./common.nix { inherit stdenv; } {
name = "glibc-locales";
installLocales = true;
builder = ./locales-builder.sh;
outputs = [ "out" ];