From bc3416a2dddd3c7a2a3182373c392292ed8e22b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 1 Aug 2021 11:28:58 +0200 Subject: [PATCH] squashfsTools: patch a channel-blocking bug Fixes #132286. --- pkgs/tools/filesystems/squashfs/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 2c8cd317f661..bec344631511 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -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 ];