pstoedit: 3.62 -> 3.70

Note that kde4.calligra, the only reverse dependency, fails to build,
but I have confirmed that it fails also with the previous pstoedit
version so the failure appears unrelated (nor does the error really
indicate that pstoedit is at fault ...).

Also
- Change meta.homepage; the original domain didn't work properly for me
- Split dev output; may want to split out bin/lib as well, for some
  decent saving
- Build with imagemagick for a slight size increase

1 files changed, 14 insertions, 9 deletions

diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index c8ecebc08689..094d9deadbf1 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, ghostscript, gd, libjpeg, zlib, plotutils, libwebp }:
+{ stdenv, fetchurl, pkgconfig
+, zlib, ghostscript, imagemagick, plotutils, gd
+, libjpeg, libwebp
+}:
 
 stdenv.mkDerivation rec {
-  name = "pstoedit-3.62";
+  name = "pstoedit-3.70";
 
   src = fetchurl {
     url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
-    sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40";
+    sha256 = "130kz0ghsrggdn70kygrmsy3n533hwd948q69vyvqz44yw9n3f06";
   };
 
-  buildInputs = [ pkgconfig ghostscript gd libjpeg zlib plotutils libwebp ];
+  outputs = [ "dev" "out" ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "Translates PostScript and PDF graphics into other vector formats";
-    homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://sourceforge.net/projects/pstoedit/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }