public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108936 from Atemu/squashfsTools-lz4Support

Browse Source 
squashfsTools: unconditionally build with lz4Support
This commit is contained in:
Sandro 2021-01-11 02:00:03 +01:00 committed by GitHub
commit 0a9371b7c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/filesystems/squashfs/default.nix
View File

@ -1,11 +1,8 @@
{ stdenv, fetchFromGitHub, zlib, xz { stdenv, fetchFromGitHub, zlib, xz
, lz4 ? null , lz4
, lz4Support ? false
, zstd , zstd
}: }:
assert lz4Support -> (lz4 != null);
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "squashfs"; pname = "squashfs";
version = "4.4"; version = "4.4";
@ -24,15 +21,13 @@ stdenv.mkDerivation {
./4k-align.patch ./4k-align.patch
] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
buildInputs = [ zlib xz zstd ] buildInputs = [ zlib xz zstd lz4 ];
++ stdenv.lib.optional lz4Support lz4;
preBuild = "cd squashfs-tools"; preBuild = "cd squashfs-tools";
installFlags = [ "INSTALL_DIR=\${out}/bin" ]; installFlags = [ "INSTALL_DIR=\${out}/bin" ];
makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ] makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ];
++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
meta = { meta = {
homepage = "http://squashfs.sourceforge.net/"; homepage = "http://squashfs.sourceforge.net/";