Merge pull request #9557 from bryanhonof/bryanhonof.fix-apple-double-…

…shenanigans Add option to libarchive so it behaves correctly
NixOS · Dec 7, 2023 · c3827ff · c3827ff
2 parents 82449a4 + bf00d5e
commit c3827ff
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/libutil/tarfile.cc b/src/libutil/tarfile.cc
@@ -53,6 +53,7 @@ TarArchive::TarArchive(Source & source, bool raw) : buffer(65536)
         archive_read_support_format_raw(archive);
         archive_read_support_format_empty(archive);
     }
+    archive_read_set_option(archive, NULL, "mac-ext", NULL);
     check(archive_read_open(archive, (void *)this, callback_open, callback_read, callback_close), "Failed to open archive (%s)");
 }
 
@@ -63,6 +64,7 @@ TarArchive::TarArchive(const Path & path)
 
     archive_read_support_filter_all(archive);
     archive_read_support_format_all(archive);
+    archive_read_set_option(archive, NULL, "mac-ext", NULL);
     check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s");
 }