Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libtiff: Add patch to fix missing Lerc in libtiff-4.pc #320105

Merged
merged 1 commit into from
Jun 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/development/libraries/libtiff/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, nix-update-script

, autoreconfHook
Expand Down Expand Up @@ -41,6 +42,15 @@ stdenv.mkDerivation (finalAttrs: {
# libc++abi 11 has an `#include <version>`, this picks up files name
# `version` in the project's include paths
./rename-version.patch
# Fix static linking of `libtiff` via `pkg-config` not working
# because `libtiff` does not declare `Lerc` dependency.
# nixpkgs has `lerc` >= 4 which provides a `.pc` file.
# TODO: Close when https://gitlab.com/libtiff/libtiff/-/merge_requests/633 is merged and available
(fetchpatch {
name = "libtiff-4.pc-Fix-Requires.private-missing-Lerc.patch";
url = "https://gitlab.com/libtiff/libtiff/-/commit/ea882c3c240c14a897b9be38d815cc1893aafa59.patch";
hash = "sha256-C0xA3k1sgKmGJjEnyG9UxhXqYBYShKUDQsyjhbEDJbQ=";
})
];

postPatch = ''
Expand Down