summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-06-11 10:22:20 +0200
committerVladimír Čunát <v@cunat.cz>2020-06-11 10:22:20 +0200
commit92aa60918f75dd0d2e72011fb52466a1917094ec (patch)
tree8b3d13bf19224a84a4f008946ba758a28a97ffa5
parent8deeeb02197d67234ca8549d6876383a368f47f8 (diff)
downloadnixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.tar
nixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.tar.gz
nixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.tar.bz2
nixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.tar.lz
nixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.tar.xz
nixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.tar.zst
nixpkgs-92aa60918f75dd0d2e72011fb52466a1917094ec.zip
nixos i18n.supportedLocales: increase systemPackages priority
https://discourse.nixos.org/t/conflict-between-glibc-and-glibclocales-workaround-inside/7608
-rw-r--r--nixos/modules/config/i18n.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index cc2ddda9d32..feb76581a72 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -68,7 +68,8 @@ with lib;
   config = {
 
     environment.systemPackages =
-      optional (config.i18n.supportedLocales != []) config.i18n.glibcLocales;
+      # We increase the priority a little, so that plain glibc in systemPackages can't win.
+      optional (config.i18n.supportedLocales != []) (lib.setPrio (-1) config.i18n.glibcLocales);
 
     environment.sessionVariables =
       { LANG = config.i18n.defaultLocale;