summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Bartsch <phil@grmr.de>2023-07-09 15:48:59 +0200
committerPhilipp Bartsch <phil@grmr.de>2023-07-12 21:38:31 +0200
commit0f474b4c6cd6202d346bc7b7220b88f3c281e478 (patch)
tree4534fb87cb88ef01bd21a6355988fa7edd2edf1d
parentad7ffe3a7c270a82e06caea439963278bbc70348 (diff)
downloadnixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.tar
nixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.tar.gz
nixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.tar.bz2
nixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.tar.lz
nixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.tar.xz
nixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.tar.zst
nixpkgs-0f474b4c6cd6202d346bc7b7220b88f3c281e478.zip
nixos/apparmor: support custom i18n glibc locales
The i18n nixos module creates a customized glibcLocales package.
Use the system specific glibcLocale instead of the vanilla one.
-rw-r--r--nixos/modules/security/apparmor/includes.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix
index d05a1d1b0d1..88051de484c 100644
--- a/nixos/modules/security/apparmor/includes.nix
+++ b/nixos/modules/security/apparmor/includes.nix
@@ -62,7 +62,7 @@ config.security.apparmor.includes = {
     include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base"
     r ${pkgs.stdenv.cc.libc}/share/locale/**,
     r ${pkgs.stdenv.cc.libc}/share/locale.alias,
-    ${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"}
+    r ${config.i18n.glibcLocales}/lib/locale/locale-archive,
     ${etcRule "localtime"}
     r ${pkgs.tzdata}/share/zoneinfo/**,
     r ${pkgs.stdenv.cc.libc}/share/i18n/**,