ipetkov/crane
1
1
Fork 0
mirror of https://github.com/ipetkov/crane.git synced 2024-11-22 05:36:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

buildTrunkPackage: correctly inherit buildPhaseCargoCommand

Browse Source
This commit is contained in:
Ivan Petkov 2024-11-18 13:22:55 -08:00
parent 30ad43e875
commit 3096fc35ad
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
* `buildTrunkPackage` will pass in `--release=true` (instead of just
`--release`) for trunk versions 0.21 or higher to avoid argument ambiguities
* `buildTrunkPackage` will now correctly honor `buildPhaseCargoCommand` if
specified (previously the value of `buildPhaseCommand` was incorrectly being
used)
* `removeReferencesToVendoredSourcesHook` avoids referencing `/dev/fd`
directly since it may not be present on certain platforms

2
lib/buildTrunkPackage.nix
View File

@ -81,7 +81,7 @@ mkCargoDerivation (args // {
echo "TRUNK_TOOLS_WASM_OPT=''${TRUNK_TOOLS_WASM_OPT}"
'';
buildPhaseCargoCommand = args.buildPhaseCommand or ''
buildPhaseCargoCommand = args.buildPhaseCargoCommand or ''
local profileArgs=""
if [[ "$CARGO_PROFILE" == "release" ]]; then
profileArgs="--release${lib.optionalString (lib.versionAtLeast trunk.version "0.21") "=true"}"