Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0f1e12a1cae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a72ba6785267
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 13, 2019

  1. libzip: 1.3.0 -> 1.5.2 

    + fix pkgconfig paths
(#68044)
    @lopsided98 @c0bw3b
    lopsided98 authored and c0bw3b committed Nov 13, 2019
    Copy the full SHA
    a72ba67 View commit details
Showing with 9 additions and 15 deletions.
  1. +9 −15 pkgs/development/libraries/libzip/default.nix
24 changes: 9 additions & 15 deletions pkgs/development/libraries/libzip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,31 @@
{ stdenv, fetchurl, perl, zlib }:
{ stdenv, fetchurl, cmake, perl, zlib }:

stdenv.mkDerivation rec {
pname = "libzip";
version = "1.3.0";
version = "1.5.2";

src = fetchurl {
url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9";
sha256 = "05ay8cbm882br0ir2cmzrvdq8q5mr1bnf53l4305xzigpd54lsdy";
};

# Fix pkgconfig file paths
postPatch = ''
patchShebangs test-driver
patchShebangs man/handle_links
sed -i CMakeLists.txt \
-e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \
-e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#'
'';

outputs = [ "out" "dev" ];

nativeBuildInputs = [ perl ];
nativeBuildInputs = [ cmake perl ];
propagatedBuildInputs = [ zlib ];

preCheck = ''
# regress/runtests is a generated file
# regress/runtest is a generated file
patchShebangs regress
'';

# At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
# had this same problem. This links it somewhere that mysqlworkbench looks.
postInstall = ''
mkdir -p $dev/lib
mv $out/lib/libzip $dev/lib/libzip
( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
'';

meta = with stdenv.lib; {
homepage = https://www.nih.at/libzip;
description = "A C library for reading, creating and modifying zip archives";