From eff53a213598dae44cc92a1b82359eed44c69628 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 24 Nov 2024 17:35:41 +0800
Subject: [PATCH] singularity-tools: enable __structuredAttrs and pass contents
 directly

---
 pkgs/build-support/singularity-tools/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index f85e9745d782..b0addfc21a5f 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -83,12 +83,14 @@ lib.makeExtensible (final: {
       result = vmTools.runInLinuxVM (
         runCommand "${projectName}-image-${name}.sif"
           {
+            __structuredAttrs = true;
             nativeBuildInputs = [
               singularity
               e2fsprogs
               util-linux
             ];
             strictDeps = true;
+            inherit contents;
             layerClosure = writeClosure ([ bashInteractive ] ++ runScriptReferences ++ contents);
             preVM = vmTools.createEmptyImage {
               size = diskSize;
@@ -121,12 +123,7 @@ lib.makeExtensible (final: {
               cp -r "$f" "./$f"
             done < "$layerClosure"
 
-            # TODO(@ShamrockLee):
-            # Once vmTools.runInLinuxVMm works with `__structuredAttrs = true` (#334705),
-            # set __structuredAttrs = true and pass contents as an attribute
-            # so that we could loop with `for c in ''${contents[@]}`
-            # instead of expanding all the paths in contents into the Bash string.
-            for c in ${lib.escapeShellArgs contents} ; do
+            for c in "''${contents[@]}"; do
               for f in "$c"/bin/* ; do
                 if [ ! -e "bin/$(basename "$f")" ] ; then
                   ln -s "$f" bin/