ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

zziplib: convert back to autotools build

Browse Source 
The cmake support in the v0.13.x branch is not very good. It heavily
relies on add_custom_command and is fragile.

The specific problem we ran into is that the install phase would not
create some of the symlinks on darwin. This breaks reverse
dependencies (e.g. texlive).

Fixes: 4f701dd3 ('zziplib: 0.13.69 → 0.13.71')
This commit is contained in:
Dmitry Kalinkin 2020-06-21 18:24:49 -04:00
parent b31645cfa9
commit 06e4bb1a3d
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
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)