diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-13 19:34:34 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-13 19:34:34 +0200 |
commit | 9e1943edc03c14854295d47001c2b46d7d2472de (patch) | |
tree | 3a7b08aa961782c4a8e77837e6532502c891bc5d /nixos/modules/services/x11/xserver.nix | |
parent | aabcf2d8f52c68ad37d72bf80d90608831450af5 (diff) | |
parent | c5a41da563485db7e34475321e22d45941de23d0 (diff) | |
download | nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.tar nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.tar.gz nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.tar.bz2 nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.tar.lz nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.tar.xz nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.tar.zst nixpkgs-9e1943edc03c14854295d47001c2b46d7d2472de.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 70716a35485..55d3e742ef7 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -711,7 +711,7 @@ in system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" { inherit (cfg) xkbModel layout xkbVariant xkbOptions; - nativeBuildInputs = [ pkgs.xkbvalidate ]; + nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ]; preferLocalBuild = true; } '' xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" |