buildPackage: fix issue with inheriting default depsOnly artifacts (#397)

This commit is contained in:
Ivan Petkov 2023-09-23 16:23:33 -07:00 committed by GitHub
parent 9dae37b4a5
commit 67f100acc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## Unreleased ## Unreleased
### Fixed
* Fixed a bug where `buildPackage` would fail to inherit artifacts from
dependency crates if `cargoArtifacts` was not explicitly specified.
## [0.14.0] - 2023-09-21 ## [0.14.0] - 2023-09-21
### Added ### Added

View File

@ -40,8 +40,10 @@ mkCargoDerivation (cleanedArgs // memoizedArgs // {
cargoArtifacts = args.cargoArtifacts or ( cargoArtifacts = args.cargoArtifacts or (
buildDepsOnly (args // memoizedArgs // { buildDepsOnly (args // memoizedArgs // {
installCargoArtifactsMode = args.installCargoArtifactsMode or "use-zstd"; installCargoArtifactsMode = args.installCargoArtifactsMode or "use-zstd";
# NB: we intentionally don't run any hooks here since we don't want to actually install # NB: we intentionally don't run any caller-provided hooks here since they might fail
installPhase = "mkdir -p $out"; # if they require any files that have been omitted by the source dummification.
# However, we still _do_ want to run the installation hook with the actual artifacts
installPhase = "prepareAndInstallCargoArtifactsDir";
}) })
); );