public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ImageMagick: propagate libs in buildInputs, use .tar.xz

Browse Source 
svn path=/nixpkgs/trunk/; revision=27372
This commit is contained in:
Yury G. Kudryashov 2011-06-07 21:49:04 +00:00
parent b7519354cc
commit 0159787b06
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -12,6 +12,7 @@
, libtool , libtool
, jasper , jasper
, libX11 , libX11
, xz
, tetex ? null , tetex ? null
, librsvg ? null , librsvg ? null
}: }:
@ -23,8 +24,8 @@ stdenv.mkDerivation rec {
name = "ImageMagick-${version}"; name = "ImageMagick-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://imagemagick/${name}.tar.bz2"; url = "mirror://imagemagick/${name}.tar.xz";
sha256 = "0byaawz7zbc75rz9hraraaggpn98lajkrad4mv5z3b2nlln2nf4i"; sha256 = "035j3i3cm29bwc9lipn838gznswrc69g7mwh8h9jj24ss2dmqrf1";
}; };
configureFlags = '' configureFlags = ''
@ -34,10 +35,13 @@ stdenv.mkDerivation rec {
${if librsvg != null then "--with-rsvg" else ""} ${if librsvg != null then "--with-rsvg" else ""}
''; '';
buildInputs = propagatedBuildInputs =
[ bzip2 freetype graphviz ghostscript libjpeg libpng [ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg
libtiff libxml2 zlib tetex librsvg libtool jasper libX11 libtool jasper libX11 ];
];
buildInputs = [ tetex graphviz ];
buildNativeInputs = [ xz ];
preConfigure = if tetex != null then preConfigure = if tetex != null then
'' ''