diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 9f1c3ecf8bcb..81210490883f 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, bzip2}: stdenv.mkDerivation { - name = "bsdiff-4.2"; + name = "bsdiff-4.3"; builder = ./builder.sh; src = fetchurl { - url = http://www.daemonology.net/bsdiff/bsdiff-4.2.tar.gz; - md5 = "9f582a77eb76d116d82d1ad268ef48fa"; + url = http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz; + sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; - patches = [./makefile.patch]; + buildInputs = [ bzip2 ]; + patchPhase = '' + sed 's/^\.//g' -i Makefile + ''; } diff --git a/pkgs/tools/compression/bsdiff/makefile.patch b/pkgs/tools/compression/bsdiff/makefile.patch deleted file mode 100644 index 94a4048631c3..000000000000 --- a/pkgs/tools/compression/bsdiff/makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rc bsdiff-orig/Makefile bsdiff-4.2/Makefile -*** bsdiff-orig/Makefile 2004-07-11 20:10:02.000000000 +0200 ---- bsdiff-4.2/Makefile 2004-11-29 22:15:05.000000000 +0100 -*************** -*** 1,7 **** - CFLAGS += -O3 -- .ifdef BZIP2 -- CFLAGS += -DBZIP2=\"${BZIP2}\" -- .endif - - PREFIX ?= /usr/local - INSTALL_PROGRAM ?= ${INSTALL} -c -s -m 555 ---- 1,4 ---- -*************** -*** 13,18 **** - - install: - ${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin -- .ifndef WITHOUT_MAN - ${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1 -- .endif ---- 10,13 ---- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 272d829f1931..5c4d24f99954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -477,7 +477,7 @@ let }; bsdiff = import ../tools/compression/bsdiff { - inherit fetchurl stdenv; + inherit fetchurl stdenv bzip2; }; bzip2 = useFromStdenv "bzip2"