fix(nix): fix nix build
- 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
This commit is contained in:
@@ -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";
|
||||
sha256 = "sha256-Wk3PZFlWqhrsQ8xG0sQaV2xSasdg2D7TMiPvl/CgtGU=";
|
||||
"https://github.com/StereoKit/sk_gpu/releases/download/v2024.9.26/sk_gpu.v2024.9.26.zip";
|
||||
sha256 = "sha256-W32RveeCszioWGtbCsvAqB28YHvOsw2xJ15MosYLFXk=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "sk_gpu";
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, xorg
|
||||
, fontconfig
|
||||
, libxkbcommon
|
||||
, xkeyboard_config
|
||||
, libclang
|
||||
|
||||
, cmake
|
||||
@@ -15,6 +16,7 @@
|
||||
, fetchFromGitHub
|
||||
, sk_gpu
|
||||
, libXau
|
||||
, libgbm
|
||||
|
||||
, libXdmcp
|
||||
, stdenv
|
||||
@@ -47,10 +49,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 ''
|
||||
@@ -78,9 +87,11 @@ rustPlatform.buildRustPackage rec {
|
||||
xorg.libXfixes
|
||||
fontconfig
|
||||
libxkbcommon
|
||||
xkeyboard_config
|
||||
libXau
|
||||
libXdmcp
|
||||
openxr-loader
|
||||
libgbm
|
||||
];
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user