Skip to content

Conversation

@hmenke
Copy link
Member

@hmenke hmenke commented Jan 11, 2024

Description of changes

This backports the unreleased fix for nih-at/libzip#404.
Without this patch the pkgconfig file contains garbage which makes it impossible to link against libzip (when using pkgconfig, of course).

Example error message:

/nix/store/w9dk8id4zmvmwqy42dyqc2k56nf14qvb-x86_64-unknown-linux-musl-binutils-2.40/bin/x86_64-unknown-linux-musl-ld: cannot find -lzstdZLIB::ZLIB: No such file or directory

Contents of libzip.pc before this patch (this was from a static build, that's why there is static-x86_64-unknown-linux-musl everywhere):

prefix=/nix/store/52wg6iaryw88vbwdsw6p5xh290klp02j-libzip-static-x86_64-unknown-linux-musl-1.10.1
exec_prefix=${prefix}
bindir=${prefix}/bin
libdir=${prefix}/lib
includedir=/nix/store/49fcxyxafnkc2c12k3lnvxifpr4vddmc-libzip-static-x86_64-unknown-linux-musl-1.10.1-dev/../49fcxyxafnkc2c12k3lnvxifpr4vddmc-libzip-static-x86_64-unknown-linux-musl-1.10.1-dev/include

zipcmp=${bindir}/zipcmp

Name: libzip
Description: library for handling zip archives
Version: 1.10.1
Libs:  -L${libdir} -lzip
Libs.private:  -lzstdZLIB::ZLIB
Cflags: -I${includedir}

Contents of libzip.pc after this patch:

prefix=/nix/store/snw41i59h4n4y50lpri6h60nsa2vzla3-libzip-1.10.1
exec_prefix=${prefix}
bindir=${prefix}/bin
libdir=${prefix}/lib
includedir=/nix/store/i1yh4v83y53i0yp1s91439i4qgwsylhq-libzip-1.10.1-dev/../i1yh4v83y53i0yp1s91439i4qgwsylhq-libzip-1.10.1-dev/include

zipcmp=${bindir}/zipcmp

Name: libzip
Description: library for handling zip archives
Version: 1.10.1
Libs:  -L${libdir} -lzip
Libs.private:  -lz
Cflags: -I${includedir}

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. and removed backport staging-23.11 labels Jan 11, 2024
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. labels Jan 11, 2024
@dotlambda dotlambda changed the title Libzip libzip: backport patch for pkgconfig file Jan 11, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jan 11, 2024
@github-actions
Copy link
Contributor

Successfully created backport PR for staging-23.11:

@hmenke hmenke deleted the libzip branch January 26, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants