Merge branch 'master' into singularity

2019-02-17 21:49:37 +00:00
parent ecb265f106 5d42605b91
commit 05ab1a6e5a
2627 changed files with 69608 additions and 39407 deletions
@@ -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