cargoBuildHook: Fix features with __structuredAttrs

2024-04-09 22:35:36 +02:00 · 2024-04-09 22:35:36 +02:00 · 6486868c28
commit 6486868c28
parent c81c241415
1 changed files with 8 additions and 1 deletions
--- 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

    (