From f663b14524ef529a41b0b8fb17461e0deb655030 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 25 Nov 2024 02:21:45 +0800
Subject: [PATCH] Revert "singularity-tools: don't preserve store content
 ownership"

Use `cp -ar` instead of `cp -r` to preserve symbolic links
and other attributes whenever possible.

This reverts commit c2eb0aa56e90cffbdcb82a54f3a9b1419e19c88b.
---
 pkgs/build-support/singularity-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index f85e9745d782..5832aa795c5b 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -118,7 +118,7 @@ lib.makeExtensible (final: {
             mkdir -p bin ./${builtins.storeDir}
             # Loop over the line-separated paths in $layerClosure
             while IFS= read -r f; do
-              cp -r "$f" "./$f"
+              cp -ar "$f" "./$f"
             done < "$layerClosure"
 
             # TODO(@ShamrockLee):