diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-06-07 21:49:04 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-06-07 21:49:04 +0000 |
| commit | 0159787b06d19e2ffc66d5f1648558496e9f58c0 (patch) | |
| tree | 9e93848e86e48c0e9ec851a14f4eaf0a7542992d /pkgs/applications/graphics | |
| parent | b7519354cc15c22aa834f9c177e0350f1783f83c (diff) | |
| download | nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.tar nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.tar.gz nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.tar.bz2 nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.tar.lz nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.tar.xz nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.tar.zst nixlib-0159787b06d19e2ffc66d5f1648558496e9f58c0.zip | |
ImageMagick: propagate libs in buildInputs, use .tar.xz
svn path=/nixpkgs/trunk/; revision=27372
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 430d3e839fa3..a4bd960655cd 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -12,6 +12,7 @@ , libtool , jasper , libX11 +, xz , tetex ? null , librsvg ? null }: @@ -23,8 +24,8 @@ stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { - url = "mirror://imagemagick/${name}.tar.bz2"; - sha256 = "0byaawz7zbc75rz9hraraaggpn98lajkrad4mv5z3b2nlln2nf4i"; + url = "mirror://imagemagick/${name}.tar.xz"; + sha256 = "035j3i3cm29bwc9lipn838gznswrc69g7mwh8h9jj24ss2dmqrf1"; }; configureFlags = '' @@ -34,10 +35,13 @@ stdenv.mkDerivation rec { ${if librsvg != null then "--with-rsvg" else ""} ''; - buildInputs = - [ bzip2 freetype graphviz ghostscript libjpeg libpng - libtiff libxml2 zlib tetex librsvg libtool jasper libX11 - ]; + propagatedBuildInputs = + [ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg + libtool jasper libX11 ]; + + buildInputs = [ tetex graphviz ]; + + buildNativeInputs = [ xz ]; preConfigure = if tetex != null then '' |