diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-09 19:39:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 19:39:08 -0500 |
| commit | 6b817682977cd630026c96d0352bb4afcc6af890 (patch) | |
| tree | 43ec5075630900981613782ded23a102a97c37ce /pkgs | |
| parent | 8786617f8f8c613536682709d028fb0232c45ff8 (diff) | |
| parent | 9cf47fb1c8d1d50b602edc61088f61c915f0fefb (diff) | |
| download | nixlib-6b817682977cd630026c96d0352bb4afcc6af890.tar nixlib-6b817682977cd630026c96d0352bb4afcc6af890.tar.gz nixlib-6b817682977cd630026c96d0352bb4afcc6af890.tar.bz2 nixlib-6b817682977cd630026c96d0352bb4afcc6af890.tar.lz nixlib-6b817682977cd630026c96d0352bb4afcc6af890.tar.xz nixlib-6b817682977cd630026c96d0352bb4afcc6af890.tar.zst nixlib-6b817682977cd630026c96d0352bb4afcc6af890.zip | |
Merge pull request #30479 from obsidiansystems/singularity-tools
singularity-tools: Only copy into /bin what is specified in contents
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/singularity-tools/default.nix | 5 |
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 5179f47eaa5e..f9b4c8a7fd35 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 |