demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

update cross-naersk

Browse source
This commit is contained in:
Robin Appelman 2023-06-26 22:44:26 +02:00
commit 1957395675
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686501881, "lastModified": 1687811683,
"narHash": "sha256-qFxW9cuCfvo7Kcc7mSt53wkP1ti4Y5PTXJKLARPIWm8=", "narHash": "sha256-j0+0y2CBlwrbVkVEZajjAy9gdzHRNCq8hQTRe+QXTAQ=",
"owner": "icewind1991", "owner": "icewind1991",
"repo": "cross-naersk", "repo": "cross-naersk",
"rev": "95a73c480942aa9910fab37c29e3412bd915252e", "rev": "5e987fcf0521602914773016b173403d0fa873f9",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
flake.nix
View file

@ -39,10 +39,8 @@
releaseTargets = lib.lists.remove hostTarget targets; releaseTargets = lib.lists.remove hostTarget targets;
toolchain = (pkgs.rust-bin.stable.latest.default.override { inherit targets; }); artifactForTarget = target: "parse_demo${cross-naersk'.execSufficForTarget target}";
execSufficForTarget = target: if lib.strings.hasInfix "windows" target then ".exe" else ""; assetNameForTarget = target: "parser-${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "eabihf" "-pc"] ["" "" "" "" ""] target}${cross-naersk'.execSufficForTarget target}";
artifactForTarget = target: "parse_demo${execSufficForTarget target}";
assetNameForTarget = target: "parser-${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "eabihf" "-pc"] ["" "" "" "" ""] target}${execSufficForTarget target}";
cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;}; cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;};
src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|benches|tests|test_data)(/.*)?"]; src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|benches|tests|test_data)(/.*)?"];
@ -58,8 +56,9 @@
asset_name = assetNameForTarget target; asset_name = assetNameForTarget target;
}) targets; }) targets;
}; };
hostNaersk = cross-naersk'.hostNaersk;
in rec { 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 // { overrideMain = args: args // {
preConfigure = '' preConfigure = ''
cargo_build_options="$cargo_build_options --bin parse_demo" cargo_build_options="$cargo_build_options --bin parse_demo"
@ -67,13 +66,13 @@
}; };
})) // rec { })) // rec {
tf-demo-parser = packages.${hostTarget}; tf-demo-parser = packages.${hostTarget};
check = (cross-naersk' hostTarget).buildPackage (nearskOpt // { check = hostNaersk.buildPackage (nearskOpt // {
mode = "check"; mode = "check";
}); });
clippy = (cross-naersk' hostTarget).buildPackage (nearskOpt // { clippy = hostNaersk.buildPackage (nearskOpt // {
mode = "clippy"; mode = "clippy";
}); });
test = (cross-naersk' hostTarget).buildPackage (nearskOpt // { test = hostNaersk.buildPackage (nearskOpt // {
release = false; release = false;
mode = "test"; mode = "test";
}); });