Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(nix): switch back to master branch nix-cargo-integration, use defaultOutputs

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2021-06-13 19:33:38 +03:00
parent 27216d9a5e
commit e27a6fcaa1
No known key found for this signature in database
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 100 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.lock
View File

@ -24,16 +24,15 @@
"rustOverlay": "rustOverlay"
},
"locked": {
"lastModified": 1623594891,
"narHash": "sha256-JmjOTdIW0QIsMoqU6oIQx9fqH0Ims83g2jK8jmokHsI=",
"lastModified": 1623601923,
"narHash": "sha256-zQDRV3OMYKlewfp3k0ilmFNfcFDxBCCk0tbcde8HMYM=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"rev": "5394e8fa179346854e44e05edced0b9d7dc818b7",
"rev": "ab922adefdeb387ce105b1bde75f62ffb971cec4",
"type": "github"
},
"original": {
"owner": "yusdacra",
"ref": "fix/crate2nix",
"repo": "nix-cargo-integration",
"type": "github"
}

14
flake.nix
View File

@ -4,16 +4,19 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixCargoIntegration = {
url = "github:yusdacra/nix-cargo-integration/fix/crate2nix";
url = "github:yusdacra/nix-cargo-integration";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs:
let
output = inputs.nixCargoIntegration.lib.makeOutputs {
inputs.nixCargoIntegration.lib.makeOutputs {
root = ./.;
buildPlatform = "crate2nix";
defaultOutputs = {
package = "veloren-voxygen";
app = "veloren-voxygen";
};
overrides = {
build = common: prev: {
runTests = !prev.release && prev.runTests;
@ -105,9 +108,4 @@
};
};
};
in
output // {
defaultApp = builtins.mapAttrs (_: apps: apps.veloren-voxygen) output.apps;
defaultPackage = builtins.mapAttrs (_: packages: packages.veloren-voxygen) output.packages;
};
}