From 7a93e63ae95964fd9579bc4ed1b605628022451b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 23 Dec 2013 18:08:09 +0100 Subject: [PATCH] libmng: update 1.0.10 -> 2.0.2, drop autotools phase --- pkgs/development/libraries/libmng/default.nix | 14 +++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 81878917384..b58e2dd257d 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,18 +1,14 @@ -{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake110x, autoconf, libtool }: +{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { - name = "libmng-1.0.10"; + name = "libmng-2.0.2"; src = fetchurl { - url = "mirror://sourceforge/libmng/${name}.tar.bz2"; - sha256 = "06415s40gz833s1v1q7c04c0m49p4sc87ich0vpdid2ldj0pf53v"; + url = "mirror://sourceforge/libmng/${name}.tar.xz"; + sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; }; - preConfigure = "unmaintained/autogen.sh"; - - nativeBuildInputs = [ automake110x autoconf libtool ]; - - propagatedBuildInputs = [ zlib libpng libjpeg lcms ]; + propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e4e7a04b5b..45b22f287b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4976,7 +4976,7 @@ let libmowgli = callPackage ../development/libraries/libmowgli { }; - libmng = callPackage ../development/libraries/libmng { lcms = lcms2; }; + libmng = callPackage ../development/libraries/libmng { }; libmnl = callPackage ../development/libraries/libmnl { };