From b2efedd5e557c0bb67dc51e89f9d17c431b9e798 Mon Sep 17 00:00:00 2001
From: Simon Pettersson <simon.v.pettersson@gmail.com>
Date: Sun, 4 Oct 2020 16:17:25 +0200
Subject: [PATCH] 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.
---
 nixos/modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 8223c1f1e675..1bbcd4ca2ab4 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"