makeself: disable tests for now, working around #110149

I couldn't find an easy way to work around this while doing the tests,
so let's disable them for now and work on fixing the sandbox shell
instead (and re-enable tests after that is deployed; I hope).

2 files changed, 4 insertions, 12 deletions

diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 353fe661483..12d4f62a783 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -12,10 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
   };
 
-  patches = [ ./tests-use-better-shell.patch ];
   postPatch = "patchShebangs test";
 
-  doCheck = true;
+  # Issue #110149: our default /bin/sh apparently has 32-bit math only
+  # (attribute busybox-sandbox-shell), and that causes problems
+  # when running these tests inside build, based on free disk space.
+  doCheck = false;
   checkTarget = "test";
   checkInputs = [ which zstd pbzip2 ];
 
diff --git a/pkgs/applications/misc/makeself/tests-use-better-shell.patch b/pkgs/applications/misc/makeself/tests-use-better-shell.patch
deleted file mode 100644
index 159a93622ad..00000000000
--- a/pkgs/applications/misc/makeself/tests-use-better-shell.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Use full bash's sh in tests instead of /bin/sh, as that would be
-too minimalist in the build sandbox.  See issue:
-https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128
-diff --git a/test/extracttest b/test/extracttest
---- a/test/extracttest
-+++ b/test/extracttest
-@@ -9,2 +9,3 @@ setupTests() {
-   $SUT $* archive makeself-test.run "Test $*" echo Testing
-+  sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run
- }