Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 24f3abdafbf0a4840d63baa91e60ba34fad00d4d
https://github.com/NixOS/nixpkgs/commit/24f3abdafbf0a4840d63baa91e60ba34fad00d4d
Author: Tristan Helmich <[email protected]>
Date: 2017-02-01 (Wed, 01 Feb 2017)
Changed paths:
M nixos/modules/services/x11/desktop-managers/enlightenment.nix
M nixos/modules/services/x11/desktop-managers/kde4.nix
M nixos/modules/services/x11/desktop-managers/kde5.nix
M nixos/modules/services/x11/xserver.nix
Log Message:
-----------
Revert "Make services.xserver.xkbDir conflict free when overriden."
This reverts commit 82bcfef109ecf58ac1503e4cab15ae53dd524f4b.
cc @nbp
Fixes #22290, #22352.
Signed-off-by: Franz Pletz <[email protected]>
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
