libmng: build library with Automake 1.10.x; the build fails with later versions

This commit is contained in:
Peter Simons 2012-07-10 15:57:40 +02:00
parent bb6c1e9878
commit 12c0998e03
2 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake, autoconf, libtool }:
{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake110x, autoconf, libtool }:
stdenv.mkDerivation rec {
name = "libmng-1.0.10";
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
preConfigure = "unmaintained/autogen.sh";
buildNativeInputs = [ automake autoconf libtool ];
buildNativeInputs = [ automake110x autoconf libtool ];
propagatedBuildInputs = [ zlib libpng libjpeg lcms ];
meta = {
meta = {
description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
homepage = http://www.libmng.com;
license = "zlib/libpng";

View File

@ -4134,9 +4134,7 @@ let
libmowgli = callPackage ../development/libraries/libmowgli { };
libmng = callPackage ../development/libraries/libmng {
automake = automake111x;
};
libmng = callPackage ../development/libraries/libmng { };
libmodplug = callPackage ../development/libraries/libmodplug {};