Skip to content

Commit e19fa2f

Browse files
authored
runzip: fix build, drop unused libzip from buildInputs, enable tests (#378802)
2 parents 8532db2 + 2d4d57f commit e19fa2f

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

pkgs/by-name/ru/runzip/package.nix

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5-
libzip,
65
libiconv,
6+
zlib,
77
autoreconfHook,
88
}:
99

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
nativeBuildInputs = [ autoreconfHook ];
1515
buildInputs = [
1616
libiconv
17-
libzip
17+
zlib
1818
];
1919

2020
src = fetchFromGitHub {
@@ -24,6 +24,17 @@ stdenv.mkDerivation rec {
2424
sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
2525
};
2626

27+
postPatch = ''
28+
patchShebangs tests/check-runzip.sh
29+
'';
30+
31+
env.NIX_CFLAGS_COMPILE = toString [
32+
"-Wno-error=implicit-int"
33+
"-Wno-error=incompatible-pointer-types"
34+
];
35+
36+
doCheck = true;
37+
2738
meta = {
2839
description = "Tool to convert filename encoding inside a ZIP archive";
2940
license = lib.licenses.bsd2;

0 commit comments

Comments
 (0)