svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32524
This commit is contained in:
parent
3652c61aed
commit
b3ef710273
@ -1,15 +1,15 @@
|
|||||||
{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
|
{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
|
||||||
, libjpeg, libpng, libtiff, libxml2, zlib, libtool
|
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
|
||||||
, libX11}:
|
, libX11}:
|
||||||
|
|
||||||
let version = "1.3.11"; in
|
let version = "1.3.13"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "graphicsmagick-${version}";
|
name = "graphicsmagick-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.bz2";
|
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
|
||||||
sha256 = "184grcvxa5w0ghiv8zf2vdva0kgp3njf20k3h6lbylspjgd3zhxg";
|
sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = "--enable-shared";
|
configureFlags = "--enable-shared";
|
||||||
@ -19,6 +19,8 @@ stdenv.mkDerivation {
|
|||||||
zlib libtool
|
zlib libtool
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildNativeInputs = [ xz ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
|
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user