diff options
Diffstat (limited to 'pkgs/tools/filesystems/squashfs/default.nix')
-rw-r--r-- | pkgs/tools/filesystems/squashfs/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index ee6a9d9a4c394..340c5add295e4 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -2,44 +2,43 @@ , stdenv , fetchFromGitHub , fetchpatch -, zlib -, xz +, help2man , lz4 , lzo -, zstd , nixosTests +, which +, xz +, zlib +, zstd }: stdenv.mkDerivation rec { pname = "squashfs"; - version = "4.5"; + version = "4.5.1"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; rev = version; - sha256 = "1nanwz5qvsakxfm37md5i7xqagv69nfik9hpj8qlp6ymw266vgxr"; + sha256 = "sha256-Y3ZPjeE9HN1F+NtGe6EchYziWrTPVQ4SuKaCvNbXMKI="; }; patches = [ # 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 ]; + buildInputs = [ zlib xz zstd lz4 lzo which help2man ]; preBuild = '' cd squashfs-tools '' ; - installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; + installFlags = [ + "INSTALL_DIR=${placeholder "out"}/bin" + "INSTALL_MANPAGES_DIR=${placeholder "out"}/share/man/man1" + ]; makeFlags = [ "XZ_SUPPORT=1" |