squashfsTools: patch a channel-blocking bug

Fixes #132286.
This commit is contained in:
Vladimír Čunát 2021-08-01 11:28:58 +02:00
parent 9254bf3607
commit bc3416a2dd
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, zlib
, xz
, lz4
@ -23,6 +24,12 @@ stdenv.mkDerivation rec {
# This patch adds an option to pad filesystems (increasing size) in
# exchange for better chunking / binary diff calculation.
./4k-align.patch
# Otherwise sizes of some files may break in our ISO; see
# https://github.com/NixOS/nixpkgs/issues/132286
(fetchpatch {
url = "https://github.com/plougher/squashfs-tools/commit/19b161c1cd3e31f7a396ea92dea4390ad43f27b9.diff";
sha256 = "15ng8m2my3a6a9hnfx474bip2vwdh08hzs2k0l5gwd36jv2z1h3f";
})
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
buildInputs = [ zlib xz zstd lz4 lzo ];