From 08c7a5efea261d72b524b5e6cfa27c1590eb8b63 Mon Sep 17 00:00:00 2001
From: nervyalloy5 <nervyalloy5@gmail.com>
Date: Thu, 22 May 2025 17:02:15 -0400
Subject: [PATCH] fix(nix): wrap executable to include correct XKB_CONFIG_ROOT
 variable

---
 nix/stardust-xr-server.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nix/stardust-xr-server.nix b/nix/stardust-xr-server.nix
index b8ca3dc..232f94c 100644
--- a/nix/stardust-xr-server.nix
+++ b/nix/stardust-xr-server.nix
@@ -22,6 +22,7 @@
 , stdenv
 , lib
 , openxr-loader
+, makeWrapper
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -78,7 +79,8 @@ rustPlatform.buildRustPackage rec {
                       --set-rpath "${libPath}" \
                     $sk/sk_gpu/tools/linux_x64/skshaderc
   '';
-  nativeBuildInputs = [ cmake pkg-config llvmPackages.libcxxClang ];
+
+  nativeBuildInputs = [ cmake pkg-config llvmPackages.libcxxClang makeWrapper ];
   buildInputs = [
     libGL
     mesa
@@ -94,4 +96,9 @@ rustPlatform.buildRustPackage rec {
     libgbm
   ];
   LIBCLANG_PATH = "${libclang.lib}/lib";
+
+  postFixup = ''
+    wrapProgram $out/bin/stardust-xr-server \
+      --set XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
+  '';
 }