Merge pull request #127878 from nagy/libzip-180

This commit is contained in:
Sandro 2021-06-23 18:05:26 +02:00 committed by GitHub
commit 07c648a672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,5 @@
{ lib, stdenv
, cmake
, fetchpatch
, fetchurl
, perl
, zlib
@ -11,32 +10,27 @@
, xz
, withOpenssl ? false
, openssl
, withZstd ? false
, zstd
}:
stdenv.mkDerivation rec {
pname = "libzip";
version = "1.7.3";
version = "1.8.0";
src = fetchurl {
url = "https://libzip.org/download/${pname}-${version}.tar.gz";
sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf";
sha256 = "17l3ygrnbszm3b99dxmw94wcaqpbljzg54h4c0y8ss8aij35bvih";
};
# Remove in next release
patches = [
(fetchpatch {
url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch";
sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a";
})
];
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ cmake perl groff ];
propagatedBuildInputs = [ zlib ];
buildInputs = lib.optionals withLZMA [ xz ]
++ lib.optionals withBzip2 [ bzip2 ]
++ lib.optionals withOpenssl [ openssl ];
++ lib.optionals withOpenssl [ openssl ]
++ lib.optionals withZstd [ zstd ];
preCheck = ''
# regress/runtest is a generated file