mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #108936 from Atemu/squashfsTools-lz4Support
squashfsTools: unconditionally build with lz4Support
This commit is contained in:
commit
0a9371b7c4
@ -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/";
|
||||
|
Loading…
Reference in New Issue
Block a user