summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-12-28 20:34:56 +0100
committerGitHub <noreply@github.com>2019-12-28 20:34:56 +0100
commit332cfab4cee02852378d3a61f9f5035099488717 (patch)
treef0bd8426d788ac407f4b5d76a12ce5416e27a752 /nixos
parent5f6635144a27a4383cf97589a623cf9a671d7004 (diff)
parent0cebd5a0b7b82987a5ad06026443a4cb3c2b8bd3 (diff)
downloadnixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar
nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.gz
nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.bz2
nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.lz
nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.xz
nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.tar.zst
nixpkgs-332cfab4cee02852378d3a61f9f5035099488717.zip
Merge pull request #76591 from lourkeur/set_XKB_CONFIG_ROOT
Fix services.xserver.extraLayouts under GNOME 3
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/extra-layouts.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix
index 1af98a1318b..b06bed7c09c 100644
--- a/nixos/modules/services/x11/extra-layouts.nix
+++ b/nixos/modules/services/x11/extra-layouts.nix
@@ -158,6 +158,12 @@ in
 
     });
 
+    environment.sessionVariables = {
+      # runtime override supported by multiple libraries e. g. libxkbcommon
+      # https://xkbcommon.org/doc/current/group__include-path.html
+      XKB_CONFIG_ROOT = "${pkgs.xkb_patched}/etc/X11/xkb";
+    };
+
     services.xserver = {
       xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
       exportConfiguration = config.services.xserver.displayManager.startx.enable;