summary refs log tree commit diff
path: root/pkgs/build-support/singularity-tools
diff options
context:
space:
mode:
authorDan Haraj <dan@obsidian.systems>2017-10-10 14:41:54 -0400
committerDan Haraj <dan@obsidian.systems>2017-10-10 14:45:39 -0400
commit9cf47fb1c8d1d50b602edc61088f61c915f0fefb (patch)
treec41d3e24f65cbe7aeb8d88133a81280067cb1b66 /pkgs/build-support/singularity-tools
parentd26f8b5e00b4a436ec8f9b7fb1b55a0dbda440c5 (diff)
downloadnixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.tar
nixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.tar.gz
nixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.tar.bz2
nixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.tar.lz
nixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.tar.xz
nixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.tar.zst
nixpkgs-9cf47fb1c8d1d50b602edc61088f61c915f0fefb.zip
singularity-tools: Only copy into /bin what is specified in contents
Diffstat (limited to 'pkgs/build-support/singularity-tools')
-rw-r--r--pkgs/build-support/singularity-tools/default.nix5
1 files changed, 4 insertions, 1 deletions
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