diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-01-24 21:58:18 -0800 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-01-25 04:50:40 -0800 |
| commit | 201148d02bd106c593d1def08d05bb410e5c669b (patch) | |
| tree | a87cbb5a86dff3a75a0f95b63c05745d2d57feac /pkgs/development/libraries/libarchive | |
| parent | 343b5c8134ac2387088f7662b2c4938361a714f1 (diff) | |
| download | nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.tar nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.tar.gz nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.tar.bz2 nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.tar.lz nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.tar.xz nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.tar.zst nixpkgs-201148d02bd106c593d1def08d05bb410e5c669b.zip | |
libarchive: backport fix for static linking
libarchive 3.6.2 broke static linking, which is causing the nixStatic jobs to fail on Hydra: - https://hydra.nixos.org/job/nixpkgs/cross-trunk/powerpc64le-nixCrossStatic.nixStatic.x86_64-linux - https://hydra.nixos.org/job/nixpkgs/cross-trunk/mips64el-nixCrossStatic.nixStatic.x86_64-linux This commit backports the fix (merged upstream) from libarchive 3.6.3. Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
Diffstat (limited to 'pkgs/development/libraries/libarchive')
| -rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 381689f9cb6..c8f050c300c 100644 --- 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 @@ -29,7 +30,7 @@ let autoreconfHook = buildPackages.autoreconfHook269; in assert xarSupport -> libxml2 != null; -stdenv.mkDerivation (finalAttrs: { +(stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; version = "3.6.2"; @@ -118,4 +119,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit cmake nix samba; }; -}) +})).overrideAttrs(previousAttrs: + assert previousAttrs.version == "3.6.2"; + lib.optionalAttrs stdenv.hostPlatform.isStatic { + patches = [ + # 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="; + }) + ]; + }) |