Merge master into staging-next

2019-08-27 16:36:47 +02:00
parent 70c1c856d4 b40ee82685
commit 98640fd482
271 changed files with 5293 additions and 2782 deletions
@@ -31,6 +31,11 @@ buildGoPackage rec {
  nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
  propagatedBuildInputs = [ coreutils squashfsTools ];

+  prePatch = ''
+    substituteInPlace internal/pkg/build/copy/copy.go \
+      --replace /bin/cp ${coreutils}/bin/cp
+  '';
+
  postConfigure = ''
    cd go/src/github.com/sylabs/singularity