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

fix nix overlay #8

Merged
Astavie merged 11 commits from main into main 2023-05-01 19:29:34 -04:00
Conversation 0 Commits 11 Files Changed 2 +18 -10
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@@ -23,16 +23,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681759395, "lastModified": 1682879489,
"narHash": "sha256-7aaRtLxLAy8qFVIA26ulB+Q5nDVzuQ71qi0s0wMjAws=", "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd749f58ba83f7155b7062dd49d08e5e47e44d50", "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

20
flake.nix
View File

@@ -1,5 +1,6 @@
{ {
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; # 22.11 does not include PR #218472, hence we use the unstable version
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
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";
@@ -27,14 +28,19 @@
}).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 = "20230420"; version = "0.10.2";
cargoSha256 = "sha256-sIs8EKGPTCs+1aOACNB0oHoX/jomjIUBlMeBD0dTJdM=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smithay-0.3.0" = "sha256-meEbYmSGQbaSbP5t55R1C/c9KNKvk20wDhPBCsT7kOY=";
};
};
postPatch = '' postPatch = ''
sk=/build/${pname}-vendor.tar.gz/stereokit-sys/StereoKit sk=$(echo $cargoDepsCopy/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";
@@ -58,7 +64,9 @@
in in
{ {
overlays.default = final: prev: { overlays.default = final: prev: {
stardust-xr.${name} = package final; stardust-xr = (prev.stardust-xr or {}) // {
${name} = package final;
};
}; };
packages."x86_64-linux".default = package (pkgs "x86_64-linux"); packages."x86_64-linux".default = package (pkgs "x86_64-linux");