diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/tools/compression/xdelta/default.nix | |
parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
download | nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/tools/compression/xdelta/default.nix')
-rw-r--r-- | pkgs/tools/compression/xdelta/default.nix | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index c85c7366cda..fcc3b373fd1 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -1,24 +1,44 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { - name = "xdelta-3.0z"; +let version = "3.0.9"; in +stdenv.mkDerivation rec { + name = "xdelta-${version}"; - src = fetchurl { - url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz; - sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m"; + src = fetchFromGitHub { + sha256 = "1pd7dyq44dbggmwkrr8251anqsf2an67zbvrk4vfnc92jkmjp17i"; + rev = "v${version}"; + repo = "xdelta-devel"; + owner = "jmacd"; }; - installPhase = - '' - mkdir -p $out/bin - cp xdelta3 $out/bin/ + buildInputs = [ autoreconfHook ]; - mkdir -p $out/share/man/man1 - cp xdelta3.1 $out/share/man/man1/ - ''; + postPatch = '' + cd xdelta3 + '' + stdenv.lib.optionalString doCheck '' + mkdir tmp + substituteInPlace testing/file.h --replace /tmp tmp + substituteInPlace xdelta3-test.h --replace /tmp $PWD/tmp + ''; - meta = { + enableParallelBuilding = true; + + doCheck = true; + checkPhase = '' + ./xdelta3regtest + ''; + + installPhase = '' + install -D -m755 xdelta3 $out/bin/xdelta3 + install -D -m644 xdelta3.1 $out/share/man/man1/xdelta3.1 + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Binary differential compression in VCDIFF (RFC 3284) format"; homepage = http://xdelta.org/; - description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression"; + license = with licenses; gpl2Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; }; } |