diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 6910f458a17d..cdb1f75cb2c3 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.08"; + version = "3.09"; pname = "epstool"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz"; - sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk"; + url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}.orig.tar.xz"; + hash = "sha256-HoUknRpE+UGLH5Wjrr2LB4TauOSd62QXrJuZbKCPYBE="; }; makeFlags = [ @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { make EPSTOOL_ROOT=$out install ''; - patches = [ ./gcc43.patch ]; - meta = with lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; diff --git a/pkgs/tools/graphics/epstool/gcc43.patch b/pkgs/tools/graphics/epstool/gcc43.patch deleted file mode 100644 index 398ce08c5182..000000000000 --- a/pkgs/tools/graphics/epstool/gcc43.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- epstool-3.08.orig/src/epstool.c 2005-06-10 04:41:00.000000000 -0500 -+++ epstool-3.08/src/epstool.c 2009-02-16 20:55:43.186140029 -0600 -@@ -2824,7 +2824,7 @@ - code = -1; - } - if ((code==0) && stdout_name && (hChildStdoutWr == -1)) { -- handle = open(stdout_name, O_WRONLY | O_CREAT); -+ handle = open(stdout_name, O_WRONLY | O_CREAT, 0644); - hChildStdoutWr = dup2(handle, 1); - if (handle != -1) - close(handle); -@@ -2832,7 +2832,7 @@ - code = -1; - } - if ((code==0) && stderr_name && (hChildStderrWr == -1)) { -- handle = open(stderr_name, O_WRONLY | O_CREAT); -+ handle = open(stderr_name, O_WRONLY | O_CREAT, 0644); - hChildStderrWr = dup2(handle, 2); - if (handle != -1) - close(handle);