Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: e82d1262123710b257038c5482a89f6a81ad6e81
https://github.com/NixOS/nixpkgs/commit/e82d1262123710b257038c5482a89f6a81ad6e81
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-06-28 (Wed, 28 Jun 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
-----------
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 <asz...@redmoonstudios.org>
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
