movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

libarchive: Add patch to fix macOS metadata handling when reading certain tarballs

Browse source 
This was merged in <https://github.com/libarchive/libarchive/pull/2636>
and fixes the root cause of the test_copy failure.

(cherry picked from commit 8fa0b532af)
This commit is contained in:
Zhaofeng Li 2025-05-24 18:52:59 -06:00 • committed by github-actions[bot]
parent b4ef085e7c
commit 826dd3a70b
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkgs/by-name/li/libarchive/package.nix
View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
acl, acl,
attr, attr,
autoreconfHook, autoreconfHook,
@ -41,6 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-nL2p2h+U25fhQQjbj16yhxhU8xEEuhNynIx7SNzl6Mo="; hash = "sha256-nL2p2h+U25fhQQjbj16yhxhU8xEEuhNynIx7SNzl6Mo=";
}; };
patches = [
# Remove in next release
#
# Fixes macOS metadata file handling when reading certain tarballs
# (e.g, bsdtar-produced tar containing a file with xattrs whose name is exactly 99 bytes long)
# <https://github.com/libarchive/libarchive/pull/2636>
#
# This also fixes test_copy in the test suite.
(fetchpatch {
name = "reset-header-state-after-mac-metadata.patch";
url = "https://github.com/libarchive/libarchive/commit/5bb36db5e19aecabccec8f351ec22f8c3a8695f0.patch";
hash = "sha256-eNGSunYZ5b0TrkBUtOO7MYGXc+SEn1Sxm8MYyI+4JsQ=";
})
];
outputs = [ outputs = [
"out" "out"
"lib" "lib"