diff options
| author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
| commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
| tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/applications/graphics | |
| parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
| parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) | |
| download | nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.gz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.bz2 nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.lz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.xz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.zst nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 0636903d329f..6caf0f05c510 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript -, libjpeg, libpng, libtiff, libxml2, zlib, libtool +, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libX11}: -let version = "1.3.11"; in +let version = "1.3.13"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { - url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.bz2"; - sha256 = "184grcvxa5w0ghiv8zf2vdva0kgp3njf20k3h6lbylspjgd3zhxg"; + url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; + sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5"; }; configureFlags = "--enable-shared"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { zlib libtool ]; + buildNativeInputs = [ xz ]; + postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* ''; |