diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-11 02:00:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 02:00:03 +0100 |
| commit | 0a9371b7c443c1d1767815db0d39b3913e6ddb5e (patch) | |
| tree | fb8fd7dfb1c0519db46d702a89f1e73efde3a700 /pkgs/tools/filesystems | |
| parent | 88c998fb2107539e8d0995e6ec766014f72a0cea (diff) | |
| parent | 579b25b5a82ed6a0630c5e09d70284370e118ddc (diff) | |
| download | nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.tar nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.tar.gz nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.tar.bz2 nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.tar.lz nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.tar.xz nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.tar.zst nixlib-0a9371b7c443c1d1767815db0d39b3913e6ddb5e.zip | |
Merge pull request #108936 from Atemu/squashfsTools-lz4Support
squashfsTools: unconditionally build with lz4Support
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/"; |