libarchive: backport fix for static linking

Picked from commit 201148d from PR #212540 (simplified, as it wouldn't apply anyway)
NixOS · Feb 9, 2023 · ece614f · ece614f · github-actions · Feb 9, 2023
1 parent 9a7e735
commit ece614f
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , acl
 , attr
 , autoreconfHook
@@ -37,6 +38,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg=";
   };
 
+  patches =
+    assert version == "3.6.2";
+    lib.optionals stdenv.hostPlatform.isStatic [
+      # fixes static linking; upstream in releases after 3.6.2
+      # https://github.com/libarchive/libarchive/pull/1825 merged upstream
+      (fetchpatch {
+        name = "001-only-add-iconv-to-pc-file-if-needed.patch";
+        url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch";
+        hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY=";
+      })
+    ];
+
   postPatch = ''
     substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)"