3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos/modules/services/x11
aszlig e82d126212
nixos/xserver: Don't use exec in xkb-layouts-exist
First of all, thanks to @pbogdan for getting this problem reproduced:

https://github.com/NixOS/nixpkgs/commit/2014db3efcd2a#commitcomment-22815396

Also thanks to @vcunat for bringing this to my attention:

https://github.com/NixOS/nixpkgs/commit/44c64fef16ed5#commitcomment-22813503

Although it is not entirely clear why Nix has killed the build prior to
finishing, it seems to be related to the process substition I was using.

So instead of using "exec touch", let's wrap this inside an if so we
don't exit too early.

Tested this against all sub-tests in nixos/tests/keymap.nix and also a
few configurations with wrong keyboard layout definitions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-28 21:39:19 +02:00
..
desktop-managers kdeFrameworks: fixup inputs and outputs 2017-06-18 08:44:45 -05:00
display-managers qt58: determine plugin and import paths from PATH 2017-06-18 08:44:47 -05:00
hardware treewide: use boolToString function 2017-04-11 18:18:53 +02:00
window-managers qtile: Fix using qtile together with desktop 2017-05-31 18:37:47 +03:00
colord.nix
compton.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
redshift.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
terminal-server.nix
unclutter-xfixes.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
unclutter.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
urxvtd.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
xautolock.nix services.xserver.xautolock: add module 2017-05-09 15:02:10 +02:00
xbanish.nix nixos/xsession: use graphical systemd user target 2017-05-29 15:05:28 +02:00
xfs.conf
xfs.nix
xserver.nix nixos/xserver: Don't use exec in xkb-layouts-exist 2017-06-28 21:39:19 +02:00