Merge #129338: makeself: try to solve issues with tests
This commit is contained in:
commit
3e0ce8c5d4
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
|
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = "patchShebangs test";
|
patches = [ ./tests-use-better-shell.patch ];
|
||||||
|
postPatch = "patchShebangs test";
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
checkTarget = "test";
|
checkTarget = "test";
|
||||||
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://megastep.org/makeself";
|
homepage = "https://makeself.io";
|
||||||
description = "Utility to create self-extracting packages";
|
description = "Utility to create self-extracting packages";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = [ maintainers.wmertens ];
|
maintainers = [ maintainers.wmertens ];
|
||||||
|
10
pkgs/applications/misc/makeself/tests-use-better-shell.patch
Normal file
10
pkgs/applications/misc/makeself/tests-use-better-shell.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
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
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user