From 5e9b49dd539cbf8f8f39d27cfa07db4dd099fb00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jan 2016 17:20:40 +0100 Subject: [PATCH] xdelta: add lzmaSupport; enable by default --- pkgs/tools/compression/xdelta/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index d490d92e7d13..54e04d303d66 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -1,7 +1,15 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook +, lzmaSupport ? true, xz ? null +}: -let version = "3.0.11"; in -stdenv.mkDerivation { +assert lzmaSupport -> xz != null; + +let + version = "3.0.11"; + mkWith = flag: name: if flag + then "--with-${name}" + else "--without-${name}"; +in stdenv.mkDerivation { name = "xdelta-${version}"; src = fetchFromGitHub { @@ -12,11 +20,17 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [] + ++ stdenv.lib.optionals lzmaSupport [ xz ]; postPatch = '' cd xdelta3 ''; + configureFlags = [ + (mkWith lzmaSupport "liblzma") + ]; + enableParallelBuilding = true; doCheck = true;