about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-06-28 21:25:10 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-06-28 21:39:19 +0200
commite82d1262123710b257038c5482a89f6a81ad6e81 (patch)
tree5b49050af131368bf21e798633da56869480cbb0 /pkgs/desktops
parent35b974a8e9a3234088502e289876ccff526950de (diff)
downloadnixlib-e82d1262123710b257038c5482a89f6a81ad6e81.tar
nixlib-e82d1262123710b257038c5482a89f6a81ad6e81.tar.gz
nixlib-e82d1262123710b257038c5482a89f6a81ad6e81.tar.bz2
nixlib-e82d1262123710b257038c5482a89f6a81ad6e81.tar.lz
nixlib-e82d1262123710b257038c5482a89f6a81ad6e81.tar.xz
nixlib-e82d1262123710b257038c5482a89f6a81ad6e81.tar.zst
nixlib-e82d1262123710b257038c5482a89f6a81ad6e81.zip
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>
Diffstat (limited to 'pkgs/desktops')
0 files changed, 0 insertions, 0 deletions