zziplib: convert back to autotools build
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:
parent
b31645cfa9
commit
06e4bb1a3d
@ -1,7 +1,6 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, cmake
|
, perl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ninja
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, zip
|
, zip
|
||||||
@ -23,12 +22,6 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix ninja parsing
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch";
|
|
||||||
sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80=";
|
|
||||||
})
|
|
||||||
|
|
||||||
# Install man pages
|
# Install man pages
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch";
|
url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch";
|
||||||
@ -44,9 +37,8 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
perl
|
||||||
pkg-config
|
pkg-config
|
||||||
ninja # make fails, unable to find test2.zip
|
|
||||||
zip
|
zip
|
||||||
python3
|
python3
|
||||||
xmlto
|
xmlto
|
||||||
@ -60,10 +52,6 @@ stdenv.mkDerivation rec {
|
|||||||
unzip
|
unzip
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
|
|
||||||
];
|
|
||||||
|
|
||||||
# tests are broken (https://github.com/gdraheim/zziplib/issues/20),
|
# tests are broken (https://github.com/gdraheim/zziplib/issues/20),
|
||||||
# and test/zziptests.py requires network access
|
# and test/zziptests.py requires network access
|
||||||
# (https://github.com/gdraheim/zziplib/issues/24)
|
# (https://github.com/gdraheim/zziplib/issues/24)
|
||||||
|
Loading…
Reference in New Issue
Block a user