aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/glibc
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2019-01-22 21:14:05 +0000
committerJörg Thalheim <joerg@thalheim.io>2019-01-22 22:08:30 +0000
commit5e24fccba45a7c72aff47cdbe305182352623124 (patch)
tree100887eb91938c2c7390f38f862df374b5492b6e /pkgs/development/libraries/glibc
parent2bfa8747f73ec09d40e631052e9e37512cb35985 (diff)
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.
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r--pkgs/development/libraries/glibc/common.nix3
-rw-r--r--pkgs/development/libraries/glibc/default.nix3
-rw-r--r--pkgs/development/libraries/glibc/locales.nix2
3 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 50d8c6e268c2..2e06af2c5948 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -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;
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 27a1267f0cfe..5d04337f732a 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -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,
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index 7090c5ceceec..2b20c17d4500 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -13,8 +13,6 @@
callPackage ./common.nix { inherit stdenv; } {
name = "glibc-locales";
- installLocales = true;
-
builder = ./locales-builder.sh;
outputs = [ "out" ];