diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index eb617ed6b9e9..5d120f61e086 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,40 +1,18 @@ -{ stdenv, fetchurl, zlib, libpng, patchutils }: +{ stdenv, fetchzip, cmake, zlib, libpng }: stdenv.mkDerivation { - name = "libharu-2.2.1"; + name = "libharu-2.3.0"; - src = fetchurl { - url = http://libharu.org/files/libharu-2.2.1.tar.bz2; - sha256 = "04493rjb4z8f04p3kjvnya8phg4b0vzy3mbdbp8jfy0dhvqg4h4j"; + src = fetchzip { + url = https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz; + sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; - configureFlags = "--with-zlib=${zlib} --with-png=${libpng}"; - - buildInputs = [ zlib libpng ]; - - patches = - [ (stdenv.mkDerivation { - name = "linpng15.patch"; - - src = fetchurl { - url = https://github.com/libharu/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff; - sha256 = "07k2x5d4pvpf8a5hvfb9pj0dpjgcvv8sdvxwx3wzbwqsf9swwrxb"; - }; - - nativeBuildInputs = [ patchutils ]; - - buildCommand = "filterdiff -x '*/CHANGES' $src > $out"; - }) - (fetchurl { - url = https://github.com/libharu/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff; - name = "endless-loop.patch"; - sha256 = "1jrajz6zdch2pyzjkhmhm1b6ms8dk62snps7fwphnpvndrm4h4rr"; - }) - ]; + buildInputs = [ zlib libpng cmake ]; meta = { description = "Cross platform, open source library for generating PDF files"; - homepage = http://libharu.org/wiki/Main_Page; + homepage = http://libharu.org/; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux;