summary refs log tree commit diff
path: root/pkgs/build-support/singularity-tools/default.nix
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2020-09-19 00:42:29 -0300
committerGitHub <noreply@github.com>2020-09-19 00:42:29 -0300
commit6740a5998b7b62a892dc1799fa2889fd3c7937cd (patch)
treeaaf5f1bc21c9795aba8048d7aaeab91ae37aae52 /pkgs/build-support/singularity-tools/default.nix
parent2a35f664394b379e0c0785cc769ff6ccc791be39 (diff)
parent8975b7b0e2f7b02af03175ca4552f74c668b77ca (diff)
downloadnixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.tar
nixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.tar.gz
nixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.tar.bz2
nixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.tar.lz
nixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.tar.xz
nixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.tar.zst
nixpkgs-6740a5998b7b62a892dc1799fa2889fd3c7937cd.zip
Merge pull request #93082 from cfhammill/cfh/fix-singularity-shell-copy
singularity-tools: Check for /bin/sh existence before symlink
Diffstat (limited to 'pkgs/build-support/singularity-tools/default.nix')
-rw-r--r--pkgs/build-support/singularity-tools/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index f1d4808e3cc..d937ec62668 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -86,7 +86,9 @@ rec {
             done
 
             # Create runScript and link shell
-            ln -s ${runtimeShell} bin/sh
+            if [ ! -e bin/sh ]; then
+              ln -s ${runtimeShell} bin/sh
+            fi
             mkdir -p .singularity.d
             ln -s ${runScriptFile} .singularity.d/runscript