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

fix and update flake #6

Merged
Astavie merged 6 commits from main into main 2023-04-20 06:35:50 -04:00
Conversation 2 Commits 6 Files Changed 2 +14 -28
2 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
flake.lock generated
View File

@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1678775037, "lastModified": 1681971746,
"narHash": "sha256-chx0tWnXKpcayPkPY3Qh+2hNwptvX8XE3o+fYZ+GNzg=", "narHash": "sha256-RAFvwcAds5WeCSUYONE+YzR0uKVuLc6BIeN4WFix4f0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "ee59e1c769657b1e27e608f8b981fa8f6b715583", "rev": "3a0b59a2ea946a533c62ac417596835779087f0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -21,27 +21,13 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1678703398, "lastModified": 1681759395,
"narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=", "narHash": "sha256-7aaRtLxLAy8qFVIA26ulB+Q5nDVzuQ71qi0s0wMjAws=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b", "rev": "cd749f58ba83f7155b7062dd49d08e5e47e44d50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -54,18 +40,17 @@
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1678695923, "lastModified": 1681913140,
"narHash": "sha256-rDhiiU8P6sf6mgj5IKgCuTRN9uYeqWr6xl4XLkKnMWg=", "narHash": "sha256-+m+eXpFa5c8nQ4hAZyshIjovKzhMfd5Eo6jQDk6eeig=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "95497533524537b1cc7a2870ce94b0b14503be8b", "rev": "2400b36a2ed40f68a26473f69ac208ba10d98af9",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View File

@@ -4,7 +4,7 @@
inputs.fenix.url = github:nix-community/fenix; inputs.fenix.url = github:nix-community/fenix;
inputs.fenix.inputs.nixpkgs.follows = "nixpkgs"; inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
outputs = { self, nixpkgs, fenix, flake-utils }: outputs = { self, nixpkgs, fenix }:
let let
name = "server"; name = "server";
pkgs = system: import nixpkgs { pkgs = system: import nixpkgs {
@@ -27,13 +27,14 @@
}).buildRustPackage rec { }).buildRustPackage rec {
pname = "stardust-xr-${name}"; pname = "stardust-xr-${name}";
src = ./.; src = ./.;
cargoDepsName = pname;
# ---- START package specific settings ---- # ---- START package specific settings ----
version = "20230314"; version = "20230420";
cargoSha256 = "sha256-H6qhpvm6Dqn6EETCtgAcT/iof9ZZHm0ahTkX9cChows="; cargoSha256 = "sha256-sIs8EKGPTCs+1aOACNB0oHoX/jomjIUBlMeBD0dTJdM=";
postPatch = '' postPatch = ''
sk=/build/${pname}-${version}-vendor.tar.gz/stereokit-sys/StereoKit sk=/build/${pname}-vendor.tar.gz/stereokit-sys/StereoKit
mkdir -p $sk/build/cpm mkdir -p $sk/build/cpm
cp ${pkgs.fetchurl { cp ${pkgs.fetchurl {
url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.32.2/CPM.cmake"; url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.32.2/CPM.cmake";