From 9cf47fb1c8d1d50b602edc61088f61c915f0fefb Mon Sep 17 00:00:00 2001
From: Dan Haraj <dan@obsidian.systems>
Date: Tue, 10 Oct 2017 14:41:54 -0400
Subject: [PATCH] singularity-tools: Only copy into /bin what is specified in
 contents

---
 pkgs/build-support/singularity-tools/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 3c27b9fc1ad..859e1461c7c 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -74,7 +74,10 @@ rec {
             mkdir -p bin nix/store
             for f in $(cat $layerClosure) ; do
               cp -ar $f ./$f
-              for f in $f/bin/* ; do
+            done
+
+            for c in ${toString contents} ; do
+              for f in $c/bin/* ; do
                 if [ ! -e bin/$(basename $f) ] ; then
                   ln -s $f bin/
                 fi