diff options
| author | lassulus <github@lassul.us> | 2024-04-16 23:10:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 23:10:26 +0200 |
| commit | 55205ec1a19ce24c30e4f490ef89cb3281d308f8 (patch) | |
| tree | 81d1782c57f037033d192465ee47d9a181ea7b73 /pkgs/build-support | |
| parent | d3b241dbfd7eea1a98be6548ebbc5c01f2e24aba (diff) | |
| parent | 6486868c2849b64dceebf9ea0048863ee1b7f823 (diff) | |
Merge pull request #302926 from helsinki-systems/fix/buildrustpackage-structuredattrs
cargoBuildHook: Fix features with __structuredAttrs
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/hooks/cargo-build-hook.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index ed982c7ff30a3..0ac9bf51a8334 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -25,7 +25,14 @@ cargoBuildHook() { fi if [ -n "${cargoBuildFeatures-}" ]; then - cargoBuildFeaturesFlag="--features=${cargoBuildFeatures// /,}" + if [ -n "$__structuredAttrs" ]; then + OLDIFS="$IFS" + IFS=','; cargoBuildFeaturesFlag="--features=${cargoBuildFeatures[*]}" + IFS="$OLDIFS" + unset OLDIFS + else + cargoBuildFeaturesFlag="--features=${cargoBuildFeatures// /,}" + fi fi ( |