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

remove flake-utils

Browse Source
This commit is contained in:
Astavie
2023-03-14 20:06:37 +01:00
parent f8b1724d3a
commit 4595330001
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flake.lock generated
View File

@@ -31,9 +31,8 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "id": "flake-utils",
"repo": "flake-utils", "type": "indirect"
"type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {

45
flake.nix
View File

@@ -4,20 +4,24 @@
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";
inputs.flake-utils.url = github:numtide/flake-utils;
outputs = { self, nixpkgs, fenix, flake-utils }: outputs = { self, nixpkgs, fenix, flake-utils }:
flake-utils.lib.simpleFlake { let
inherit self nixpkgs; name = "server";
name = "stardust-xr"; pkgs = system: import nixpkgs {
systems = [ "x86_64-linux" "aarch64-linux" ]; inherit system;
};
shell = pkgs: pkgs.mkShell {
inputsFrom = [ self.packages.${pkgs.system}.default ];
overlay = pkgs: prev: # ---- START package specific dev settings ----
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
# ---- END package specific dev settings ----
};
package = pkgs:
let let
toolchain = fenix.packages.${pkgs.system}.minimal.toolchain; toolchain = fenix.packages.${pkgs.system}.minimal.toolchain;
in
name = "server"; (pkgs.makeRustPlatform {
pkg = (pkgs.makeRustPlatform {
cargo = toolchain; cargo = toolchain;
rustc = toolchain; rustc = toolchain;
}).buildRustPackage rec { }).buildRustPackage rec {
@@ -50,17 +54,16 @@
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
# ---- END package specific settings ---- # ---- END package specific settings ----
}; };
in in
{ {
stardust-xr.${name} = pkg; overlays.default = final: prev: {
stardust-xr.defaultPackage = pkg; stardust-xr.${name} = package final;
};
shell = { pkgs }: pkgs.mkShell {
inputsFrom = [ pkgs.stardust-xr.defaultPackage ];
# ---- START package specific dev settings ----
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
# ---- END package specific dev settings ----
}; };
packages."x86_64-linux".default = package (pkgs "x86_64-linux");
packages."aarch64-linux".default = package (pkgs "aarch64-linux");
devShells."x86_64-linux".default = shell (pkgs "x86_64-linux");
devShells."aarch64-linux".default = shell (pkgs "aarch64-linux");
}; };
} }