diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-23 18:02:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 18:02:26 +0100 |
| commit | c2b9b8031f302d936ed798c716eecd01ae270f8b (patch) | |
| tree | ff083943558c21f55cadbe986b230b1fb5a7a39e /nixos | |
| parent | b1a9bcfb161043297a63d9c6b5887b92debfcf3b (diff) | |
| parent | b79c28495213ce8b8038d7b85ac5ba850b378dc6 (diff) | |
| download | nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.tar nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.tar.gz nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.tar.bz2 nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.tar.lz nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.tar.xz nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.tar.zst nixlib-c2b9b8031f302d936ed798c716eecd01ae270f8b.zip | |
Merge pull request #24026 from benley/use-xkbDir
nixos: Use xkbDir consistently so it has an effect
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 38e24e9b709a..b02eaf861a0d 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -64,7 +64,7 @@ in security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset"; environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + { source = xcfg.xkbDir; target = "X11/xkb"; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 918841e8f168..d981cd5328e1 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -176,7 +176,7 @@ in environment.pathsToLink = [ "/share" ]; environment.etc = singleton { - source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + source = xcfg.xkbDir; target = "X11/xkb"; }; |