mirror of
https://codeberg.org/demostf/parser.git
synced 2026-06-03 10:14:06 +02:00
update cross-naersk
This commit is contained in:
parent
500e43c9de
commit
1957395675
2 changed files with 10 additions and 11 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -10,11 +10,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1686501881,
|
||||
"narHash": "sha256-qFxW9cuCfvo7Kcc7mSt53wkP1ti4Y5PTXJKLARPIWm8=",
|
||||
"lastModified": 1687811683,
|
||||
"narHash": "sha256-j0+0y2CBlwrbVkVEZajjAy9gdzHRNCq8hQTRe+QXTAQ=",
|
||||
"owner": "icewind1991",
|
||||
"repo": "cross-naersk",
|
||||
"rev": "95a73c480942aa9910fab37c29e3412bd915252e",
|
||||
"rev": "5e987fcf0521602914773016b173403d0fa873f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
15
flake.nix
15
flake.nix
|
|
@ -39,10 +39,8 @@
|
|||
|
||||
releaseTargets = lib.lists.remove hostTarget targets;
|
||||
|
||||
toolchain = (pkgs.rust-bin.stable.latest.default.override { inherit targets; });
|
||||
execSufficForTarget = target: if lib.strings.hasInfix "windows" target then ".exe" else "";
|
||||
artifactForTarget = target: "parse_demo${execSufficForTarget target}";
|
||||
assetNameForTarget = target: "parser-${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "eabihf" "-pc"] ["" "" "" "" ""] target}${execSufficForTarget target}";
|
||||
artifactForTarget = target: "parse_demo${cross-naersk'.execSufficForTarget target}";
|
||||
assetNameForTarget = target: "parser-${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "eabihf" "-pc"] ["" "" "" "" ""] target}${cross-naersk'.execSufficForTarget target}";
|
||||
|
||||
cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;};
|
||||
src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|benches|tests|test_data)(/.*)?"];
|
||||
|
|
@ -58,8 +56,9 @@
|
|||
asset_name = assetNameForTarget target;
|
||||
}) targets;
|
||||
};
|
||||
hostNaersk = cross-naersk'.hostNaersk;
|
||||
in rec {
|
||||
packages = lib.attrsets.genAttrs targets (target: (cross-naersk' target).buildPackage (nearskOpt // {
|
||||
packages = lib.attrsets.genAttrs targets (target: (cross-naersk'.buildPackage target) (nearskOpt // {
|
||||
overrideMain = args: args // {
|
||||
preConfigure = ''
|
||||
cargo_build_options="$cargo_build_options --bin parse_demo"
|
||||
|
|
@ -67,13 +66,13 @@
|
|||
};
|
||||
})) // rec {
|
||||
tf-demo-parser = packages.${hostTarget};
|
||||
check = (cross-naersk' hostTarget).buildPackage (nearskOpt // {
|
||||
check = hostNaersk.buildPackage (nearskOpt // {
|
||||
mode = "check";
|
||||
});
|
||||
clippy = (cross-naersk' hostTarget).buildPackage (nearskOpt // {
|
||||
clippy = hostNaersk.buildPackage (nearskOpt // {
|
||||
mode = "clippy";
|
||||
});
|
||||
test = (cross-naersk' hostTarget).buildPackage (nearskOpt // {
|
||||
test = hostNaersk.buildPackage (nearskOpt // {
|
||||
release = false;
|
||||
mode = "test";
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue