From 579b25b5a82ed6a0630c5e09d70284370e118ddc Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 10 Jan 2021 11:22:35 +0100
Subject: squashfsTools: unconditionally build with lz4Support

Can't think of a reason to not enable that.
---
 pkgs/tools/filesystems/squashfs/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'pkgs/tools/filesystems/squashfs')

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/";
-- 
cgit 1.4.1