diff options
| author | Atemu <atemu.main@gmail.com> | 2021-01-10 11:22:35 +0100 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2021-01-10 12:56:46 +0100 |
| commit | 579b25b5a82ed6a0630c5e09d70284370e118ddc (patch) | |
| tree | 88eb899b0b5019e441391a415b40bac71d6fe29f /pkgs/tools/filesystems | |
| parent | f211631c1cb3e94828c7650b5d12c1e5a89e0e16 (diff) | |
squashfsTools: unconditionally build with lz4Support
Can't think of a reason to not enable that.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/squashfs/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 645633a87e1e..16390cba238c 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchFromGitHub, zlib, xz -, lz4 ? null -, lz4Support ? false +, lz4 , zstd }: -assert lz4Support -> (lz4 != null); - stdenv.mkDerivation { pname = "squashfs"; version = "4.4"; @@ -24,15 +21,13 @@ stdenv.mkDerivation { ./4k-align.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd ] - ++ stdenv.lib.optional lz4Support lz4; + buildInputs = [ zlib xz zstd lz4 ]; preBuild = "cd squashfs-tools"; installFlags = [ "INSTALL_DIR=\${out}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ] - ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; + makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ]; meta = { homepage = "http://squashfs.sourceforge.net/"; |