libzip: 1.6.1 -> 1.7.3
libzip's pkgconfig paths are now fixed on git master and the patch backports cleanly.master
parent
c564d1e1ce
commit
4609c36e73
|
@ -1,20 +1,27 @@
|
||||||
{ lib, stdenv, fetchurl, cmake, perl, zlib }:
|
{ lib, stdenv
|
||||||
|
, cmake
|
||||||
|
, fetchpatch
|
||||||
|
, fetchurl
|
||||||
|
, perl
|
||||||
|
, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libzip";
|
pname = "libzip";
|
||||||
version = "1.6.1";
|
version = "1.7.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
|
url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
|
||||||
sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6";
|
sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fix pkg-config file paths
|
# Remove in next release
|
||||||
postPatch = ''
|
patches = [
|
||||||
sed -i CMakeLists.txt \
|
(fetchpatch {
|
||||||
-e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \
|
url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch";
|
||||||
-e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#'
|
sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a";
|
||||||
'';
|
})
|
||||||
|
];
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue