MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #91260 from veprbl/pr/zziplib_no_cmake

Browse source 
zziplib: convert back to autotools build
This commit is contained in:
Dmitry Kalinkin 2020-06-24 14:23:35 -04:00 committed by GitHub
commit a9e15a6eb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/zziplib/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, cmake
, perl
, pkg-config
, ninja
, fetchFromGitHub
, fetchpatch
, zip
@ -23,12 +22,6 @@ stdenv.mkDerivation rec {
};
patches = [
# Fix ninja parsing
(fetchpatch {
url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch";
sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80=";
})
# Install man pages
(fetchpatch {
url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch";
@ -44,9 +37,8 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
cmake
perl
pkg-config
ninja # make fails, unable to find test2.zip
zip
python3
xmlto
@ -60,10 +52,6 @@ stdenv.mkDerivation rec {
unzip
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
# tests are broken (https://github.com/gdraheim/zziplib/issues/20),
# and test/zziptests.py requires network access
# (https://github.com/gdraheim/zziplib/issues/24)