about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2024-04-09 22:35:36 +0200
committerJanne Heß <janne@hess.ooo>2024-04-10 09:24:17 +0200
commit6486868c2849b64dceebf9ea0048863ee1b7f823 (patch)
tree4655e9a172ad6eb8ae413cf72880e3a7f620d9dc /pkgs/build-support
parentc81c2414155adffb06d68b894f791dc243ecf2ae (diff)
cargoBuildHook: Fix features with __structuredAttrs
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/rust/hooks/cargo-build-hook.sh9
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
 
     (