diff options
| author | Justin Bedő <cu@cua0.org> | 2019-02-17 21:49:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 21:49:37 +0000 |
| commit | 05ab1a6e5a14ec53c6f811de0427c3e85092f594 (patch) | |
| tree | d6a2b23e0d61ec159bcf4d2b5f7e30b22b546acb /pkgs/build-support/singularity-tools | |
| parent | ecb265f106ab115dd3907d07c2d2fde026574f3e (diff) | |
| parent | 5d42605b918f80a8cf4964ad42023791cae89e67 (diff) | |
| download | nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.tar nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.tar.gz nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.tar.bz2 nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.tar.lz nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.tar.xz nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.tar.zst nixpkgs-05ab1a6e5a14ec53c6f811de0427c3e85092f594.zip | |
Merge branch 'master' into singularity
Diffstat (limited to 'pkgs/build-support/singularity-tools')
| -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 cc86fef64cc..4206b0f33ff 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 |