Author: urkud
Date: Thu Feb 23 21:25:15 2012
New Revision: 32524
URL: https://nixos.org/websvn/nix/?rev=32524&sc=1
Log:
svn merge ^/nixpkgs/trunk
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/graphicsmagick/default.nix
Modified:
nixpkgs/branches/libpng15/pkgs/applications/graphics/graphicsmagick/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/applications/graphics/graphicsmagick/default.nix
Thu Feb 23 21:14:19 2012 (r32523)
+++
nixpkgs/branches/libpng15/pkgs/applications/graphics/graphicsmagick/default.nix
Thu Feb 23 21:25:15 2012 (r32524)
@@ -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 @@
zlib libtool
];
+ buildNativeInputs = [ xz ];
+
postInstall = ''
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
