summary refs log tree commit diff
diff options
context:
space:
mode:
authorLouis Bettens <louis@bettens.info>2019-12-20 22:52:53 +0100
committerLouis Bettens <louis@bettens.info>2019-12-28 12:34:56 +0100
commit636dabcf806e97b9eea3b999f594e4ca6cfe4c7e (patch)
treeaa0e708e223a06f322d0d45f5d89415df1b25224
parentb9d274b89d389a35325069bcc6a78d7c482c80fc (diff)
downloadnixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.tar
nixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.tar.gz
nixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.tar.bz2
nixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.tar.lz
nixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.tar.xz
nixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.tar.zst
nixpkgs-636dabcf806e97b9eea3b999f594e4ca6cfe4c7e.zip
nixos/xserver: set $XKB_CONFIG_ROOT
-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;