squashfsTools: make alignment patch apply to 4.4

I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged (which required editing one line in the patch,
as it assumed to be applied on top of the reproducibility patches). Then
I rebased that on top of master, resolved one conflict, and I formatted
a new patch for this.
This commit is contained in:
Ruud van Asseldonk
2019-09-07 18:58:31 +02:00
parent 442cf4f783
commit a60ee9a74c
2 changed files with 32 additions and 22 deletions
+1 -2
View File
@@ -21,8 +21,7 @@ stdenv.mkDerivation {
patches = [
# This patch adds an option to pad filesystems (increasing size) in
# exchange for better chunking / binary diff calculation.
# TODO(ruuda): make this patch apply to the proper 4.4 release.
# ./squashfs-tools-4.4-4k-align.patch
./4k-align.patch
] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
buildInputs = [ zlib xz zstd ]