fix(nix): wrap executable to include correct XKB_CONFIG_ROOT variable

- Update flake.lock
- Switch to correct version of sk_gpu.zip in /nix/sk_gpu.nix
- Add xkeyboard_config and libgbm to dependencies in
  /nix/stardust-xr-server.nix
- Add openxr-loader to github fetches and add it to CPM local packages

flake.lock

@@ -26,11 +26,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1722555600,
+        "lastModified": 1743550720,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712014858,
+        "lastModified": 1743550720,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -65,11 +65,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1713050562,
+        "lastModified": 1725868201,
-        "narHash": "sha256-m7c6XpmpTM1URuqMG2KqtaWbL2Vt8vJFJtmvq123BmY=",
+        "narHash": "sha256-rDBQ9tXQCCA7emikSYH59ADJELE2IpzB7eoLrpHYzU4=",
         "owner": "StardustXR",
         "repo": "flatland",
-        "rev": "b3b0f29c4ea1b82c96cf9de507837bf15a5e4c0e",
+        "rev": "0914dd3df54a5e6258dfc0a02d65af1c0fc0fc90",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1719226092,
+        "lastModified": 1747284884,
-        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
+        "narHash": "sha256-lTSKhRrassMcJ1ZsuUVunyl/F04vvCKY80HB/4rvvm4=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
+        "rev": "7168f6002a6b48a9b6151e1e97e974a0722ecfdc",
         "type": "github"
       },
       "original": {
@@ -115,23 +115,26 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1722555339,
+        "lastModified": 1743296961,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
-        "type": "tarball",
+        "owner": "nix-community",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "repo": "nixpkgs.lib",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "nix-community",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "repo": "nixpkgs.lib",
+        "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1713714899,
+        "lastModified": 1747179050,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
         "type": "github"
       },
       "original": {
@@ -143,11 +146,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1723991338,
+        "lastModified": 1747542820,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
         "type": "github"
       },
       "original": {

nix/sk_gpu.nix

@@ -3,8 +3,8 @@
 let
   sk_gpu_zip = fetchurl {
     url =
-      "https://github.com/StereoKit/sk_gpu/releases/download/v2024.8.16/sk_gpu.v2024.8.16.zip";
+      "https://github.com/StereoKit/sk_gpu/releases/download/v2024.9.26/sk_gpu.v2024.9.26.zip";
-    sha256 = "sha256-Wk3PZFlWqhrsQ8xG0sQaV2xSasdg2D7TMiPvl/CgtGU=";
+    sha256 = "sha256-W32RveeCszioWGtbCsvAqB28YHvOsw2xJ15MosYLFXk=";
   };
 in stdenv.mkDerivation rec {
   name = "sk_gpu";

nix/stardust-xr-server.nix

@@ -6,6 +6,7 @@
 , xorg
 , fontconfig
 , libxkbcommon
+, xkeyboard_config
 , libclang
 
 , cmake
@@ -15,11 +16,13 @@
 , fetchFromGitHub
 , sk_gpu
 , libXau
+, libgbm
 
 , libXdmcp
 , stdenv
 , lib
 , openxr-loader
+, makeWrapper
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -47,10 +50,17 @@ rustPlatform.buildRustPackage rec {
     rev = "900e40fb5d2502927360fe2f31762bdbb624455f";
     sha256 = "sha256-zBRAXgG5Fi6+5uPQCI/RCGatY6O4ELuYBoKrPNn4K+8=";
   };
+  openxr_loader = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "OpenXR-SDK";
+    rev = "288d3a7ebc1ad959f62d51da75baa3d27438c499";
+    sha256 = "sha256-RdmnBe26hqPmqwCHIJolF6bSmZRmIKVlGF+TXAY35ig=";
+  };
 
   DEP_MESHOPTIMIZER_SOURCE = "${meshoptimizer}";
   DEP_BASIS_UNIVERSAL_SOURCE = "${basis_universal}";
   DEP_SK_GPU_SOURCE = "${sk_gpu}";
+  DEP_OPENXR_LOADER_SOURCE = "${openxr_loader}";
 
   postPatch = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
   in ''
@@ -69,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
@@ -78,9 +89,16 @@ rustPlatform.buildRustPackage rec {
     xorg.libXfixes
     fontconfig
     libxkbcommon
+    xkeyboard_config
     libXau
     libXdmcp
     openxr-loader
+    libgbm
   ];
   LIBCLANG_PATH = "${libclang.lib}/lib";
+
+  postFixup = ''
+    wrapProgram $out/bin/stardust-xr-server \
+      --set XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
+  '';
 }