alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Make services.xserver.xkbDir conflict free when overriden.

Browse source
This commit is contained in:
Nicolas B. Pierron 2017-01-14 17:47:43 +00:00 committed by Nicolas B. Pierron
parent 58dcda6b8c
commit 82bcfef109
4 changed files with 11 additions and 28 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,10 +64,7 @@ in
security.setuidPrograms = [ "e_freqset" ];
environment.etc = singleton
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
services.xserver.exportConfiguration = true;
fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

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

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

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

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

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

@ -465,23 +465,15 @@ in
}
];
environment.etc =
(optionals cfg.exportConfiguration
[ { source = "${configFile}";
target = "X11/xorg.conf";
}
# -xkbdir command line option does not seems to be passed to xkbcomp.
{ source = "${cfg.xkbDir}";
target = "X11/xkb";
}
])
environment.etc = mkMerge [
(mkIf cfg.exportConfiguration {
"X11/xorg.conf".source = configFile;
"X11/xkb".source = cfg.xkbDir;
})
# 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
[{
source = xorg.xf86inputevdev.out + "/share" + cfgPath;
target = cfgPath;
}]
);
(let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
{ "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; })
];
environment.systemPackages =
[ xorg.xorgserver.out