From 2aafeedd15e33491f637a20baf5b1b3b4fd5b4a3 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 27 Dec 2018 15:13:48 +0200
Subject: squashfs: 4.4dev -> 4.4dev-20180612

This squashfstools release finally has `zstd` support.
---
 pkgs/tools/filesystems/squashfs/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools/filesystems/squashfs/default.nix')

diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 389a614f54b..2fd3d52bdf6 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchFromGitHub, zlib, xz
 , lz4 ? null
 , lz4Support ? false
+, zstd
 }:
 
 assert lz4Support -> (lz4 != null);
 
 stdenv.mkDerivation rec {
-  name = "squashfs-4.4dev";
+  name = "squashfs-${version}";
+  version = "4.4dev_20180612";
 
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
-    sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks";
-    rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d";
+    sha256 = "1y53z8dkph3khdyhkmkmy0sg9p1n8czv3vj4l324nj8kxyih3l2c";
+    rev = "6e242dc95485ada8d1d0b3dd9346c5243d4a517f";
   };
 
   patches = [
@@ -28,14 +30,14 @@ stdenv.mkDerivation rec {
     ./squashfs-tools-4.3-4k-align.patch
   ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
-  buildInputs = [ zlib xz ]
+  buildInputs = [ zlib xz zstd ]
     ++ stdenv.lib.optional lz4Support lz4;
 
   preBuild = "cd squashfs-tools";
 
   installFlags = "INSTALL_DIR=\${out}/bin";
 
-  makeFlags = [ "XZ_SUPPORT=1" ]
+  makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ]
     ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
 
   meta = {
-- 
cgit 1.4.1