mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
libarchive: Add patch to fix macOS metadata handling when reading certain tarballs
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:
parent
b4ef085e7c
commit
826dd3a70b
1 changed files with 16 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
acl,
|
||||
attr,
|
||||
autoreconfHook,
|
||||
|
@ -41,6 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
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 = [
|
||||
"out"
|
||||
"lib"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue