diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-08-01 11:28:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-08-01 11:30:06 +0200 |
| commit | bc3416a2dddd3c7a2a3182373c392292ed8e22b6 (patch) | |
| tree | cda09512864c4b4147bb440482d291189df53427 /pkgs/tools/filesystems/squashfs/default.nix | |
| parent | 9254bf3607b939f85c2c105d59b67e5878c0b250 (diff) | |
| download | nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.tar nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.tar.gz nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.tar.bz2 nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.tar.lz nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.tar.xz nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.tar.zst nixpkgs-bc3416a2dddd3c7a2a3182373c392292ed8e22b6.zip | |
squashfsTools: patch a channel-blocking bug
Fixes #132286.
Diffstat (limited to 'pkgs/tools/filesystems/squashfs/default.nix')
| -rw-r--r-- | pkgs/tools/filesystems/squashfs/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 2c8cd317f66..bec34463151 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 ]; |