Skip to content

Commit

Permalink
Merge pull request #320105 from nh2/libtiff-static-lerc-pc-file
Browse files Browse the repository at this point in the history
libtiff: Add patch to fix missing `Lerc` in libtiff-4.pc
  • Loading branch information
nh2 committed Jun 16, 2024
2 parents 6f59ed8 + 762abd8 commit 446e138
Showing 1 changed file with 10 additions and 0 deletions.
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 @@ -43,6 +44,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

0 comments on commit 446e138

Please sign in to comment.