Merge pull request #67457 from scalavision/singularity-rewrite-path-to-cp

singularity: prepatch path to cp in 3.2.1
2019-08-26 22:59:34 +02:00
parent 279bd6fcd9 3ce3e75946
commit a69ce83649
1 changed files with 5 additions and 0 deletions
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -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