1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
nixpkgs/nixos/modules
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
..
config
hardware
i18n/input-method
installer nix: 1.11.10 -> 1.11.11 2017-06-19 19:03:39 +02:00
misc minio service: add inital service 2017-06-26 04:07:37 +02:00
profiles nixos: replaced "userns" with "user namespaces" for clarity 2017-06-22 22:04:34 +02:00
programs zsh: extend default $fpath configured by NixOS to find "vendor-completions" 2017-06-26 10:50:52 +02:00
security security-wrapper: run activation script after specialfs 2017-06-26 09:26:16 +02:00
service-managers
services nixos/xserver: Don't use exec in xkb-layouts-exist 2017-06-28 21:39:19 +02:00
system systemd-boot-builder.py: add support for profiles (#26318) 2017-06-24 20:33:34 +01:00
tasks
testing
virtualisation
module-list.nix Merge pull request #26073 from florianjacob/piwik-package 2017-06-27 20:51:16 +01:00
rename.nix