public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make services.xserver.xkbDir conflict free when overriden."

Browse Source 
This reverts commit 82bcfef109ecf58ac1503e4cab15ae53dd524f4b.

cc @nbp

Fixes #22290, #22352.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
This commit is contained in:
Tristan Helmich 2017-01-30 14:03:42 +01:00 committed by Franz Pletz
parent 29844c66fa
commit 24f3abdafb
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@ -64,7 +64,10 @@ in
security.setuidPrograms = [ "e_freqset" ]; security.setuidPrograms = [ "e_freqset" ];
services.xserver.exportConfiguration = true; environment.etc = singleton
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

5
nixos/modules/services/x11/desktop-managers/kde4.nix
View File

@ -183,7 +183,10 @@ in
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
}; };
services.xserver.exportConfiguration = true; environment.etc = singleton
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
# Enable helpful DBus services. # Enable helpful DBus services.
services.udisks2.enable = true; services.udisks2.enable = true;

5
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -199,7 +199,10 @@ in
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
services.xserver.exportConfiguration = true; environment.etc = singleton {
source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
environment.variables = environment.variables =
{ {

24
nixos/modules/services/x11/xserver.nix
View File

@ -465,15 +465,23 @@ in
} }
]; ];
environment.etc = mkMerge [ environment.etc =
(mkIf cfg.exportConfiguration { (optionals cfg.exportConfiguration
"X11/xorg.conf".source = configFile; [ { source = "${configFile}";
"X11/xkb".source = cfg.xkbDir; target = "X11/xorg.conf";
}) }
# -xkbdir command line option does not seems to be passed to xkbcomp.
{ source = "${cfg.xkbDir}";
target = "X11/xkb";
}
])
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5 # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
(let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
{ "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; }) [{
]; source = xorg.xf86inputevdev.out + "/share" + cfgPath;
target = cfgPath;
}]
);
environment.systemPackages = environment.systemPackages =
[ xorg.xorgserver.out [ xorg.xorgserver.out