libtiff: fix static (properly) (#379305)

NixOS · Feb 4, 2025 · 59183db · 59183db
2 parents c91a43b + 83ccb86
commit 59183db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 37 deletions.
diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
@@ -43,7 +43,13 @@ 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
-    ./static.patch
+
+    # https://gitlab.com/libtiff/libtiff/-/merge_requests/685
+    (fetchpatch {
+      name = "static.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/e6f3d60187a699507d6c85c5c63a8f258d8b8ebc.patch";
+      hash = "sha256-TZE7nyOPojxnR9/jiZbv2LgKS2Yz+Db9lbLgeefrQsc=";
+    })
   ];
 
   postPatch = ''

diff --git a/pkgs/by-name/li/libtiff/static.patch b/pkgs/by-name/li/libtiff/static.patch