From ec38df81a9c189c5d5cd1286bba1f43dc0ed978d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 28 Oct 2020 13:00:17 -0700
Subject: [PATCH] buildFHSUserEnvBubblewrap: fix whitespace with root
directories
---
pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index c7cfd27d3faa..83d5d371b397 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -77,13 +77,13 @@ let
done
fi
- auto_mounts=""
+ declare -a auto_mounts
# loop through all directories in the root
for dir in /*; do
# if it is a directory and it is not in the blacklist
if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then
# add it to the mount list
- auto_mounts="$auto_mounts --bind $dir $dir"
+ auto_mounts+=(--bind "$dir" "$dir")
fi
done
@@ -97,7 +97,7 @@ let
--ro-bind /nix /nix \
${etcBindFlags} \
$ro_mounts \
- $auto_mounts \
+ "''${auto_mounts[@]}" \
${init runScript}/bin/${name}-init ${initArgs}
'';