StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

fix: upgrade stereokit-rust and attempt nix upgrade

Browse Source
This commit is contained in:
Nova
2024-08-07 14:36:19 -04:00
parent 14ebe85493
commit e0a7d4f44a
6 changed files with 64 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nix/stardust-xr-server.nix
View File

@@ -22,15 +22,15 @@ rustPlatform.buildRustPackage rec {
};
CPM_SOURCE_CACHE = "./build";
postPatch = ''
sk=$(echo $cargoDepsCopy/stereokit-sys-*/StereoKit)
sk=$(echo $cargoDepsCopy/stereokit-rust-*/StereoKit)
mkdir -p $sk/build/cpm
# This is not ideal, the original approach was to fetch the exact cmake
# file version that was wanted from GitHub directly, but at least this way it comes from Nixpkgs.. so meh
cp ${cpm-cmake}/share/cpm/CPM.cmake $sk/build/cpm/CPM_0.32.2.cmake
cp ${cpm-cmake}/share/cpm/CPM.cmake $sk/build/cpm/CPM_0.38.7.cmake
'';
nativeBuildInputs = [
cmake pkg-config llvmPackages.libcxxClang
cmake cpm-cmake pkg-config llvmPackages.libcxxClang
];
buildInputs = [
openxr-loader libGL mesa xorg.libX11 fontconfig libxkbcommon