diff options
| author | Simon Pettersson <simon.v.pettersson@gmail.com> | 2020-10-04 16:17:25 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-10-11 20:08:57 +0200 |
| commit | b2efedd5e557c0bb67dc51e89f9d17c431b9e798 (patch) | |
| tree | e2c9e57855e1fd6f85ab1085f5ac0232cc96cd98 /nixos/modules/services/x11/xserver.nix | |
| parent | e209807f0d07901f059fbb9eeed2846d584a738f (diff) | |
| download | nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.tar nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.tar.gz nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.tar.bz2 nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.tar.lz nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.tar.xz nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.tar.zst nixpkgs-b2efedd5e557c0bb67dc51e89f9d17c431b9e798.zip | |
nixos/xserver: fix xkbvalidate for cross compiling.
xserver uses the wrong version of xkbvalidate, the one from buildPackages should be used or else the resulting xkbvalidate binary is compiled for the target architecture.
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 8223c1f1e67..1bbcd4ca2ab 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -716,7 +716,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" |