diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-06-21 18:24:49 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-06-21 18:31:20 -0400 |
| commit | 06e4bb1a3deb7b458725472926e72be2772815dd (patch) | |
| tree | e21435c7e2a61c9344786da9a2bb840970dd1289 /pkgs/development/libraries | |
| parent | b31645cfa9cbc65bc02179170cd768d81bc8d51a (diff) | |
| download | nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.tar nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.tar.gz nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.tar.bz2 nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.tar.lz nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.tar.xz nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.tar.zst nixpkgs-06e4bb1a3deb7b458725472926e72be2772815dd.zip | |
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')
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/zziplib/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 670a911cb6e..228dfdcf77a 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -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) |