diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
| commit | 3e31d23d994b94b9883a39037e328c026491b999 (patch) | |
| tree | aa5fec3413ae5b31a32ce37423ed677206121883 /pkgs/tools/graphics | |
| parent | 0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4 (diff) | |
| parent | 2c07921cff84dfb0b9e0f6c2d10ee2bfee6a85ac (diff) | |
| download | nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.gz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.bz2 nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.lz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.xz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.zst nixlib-3e31d23d994b94b9883a39037e328c026491b999.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/pstoedit/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 623415a314b5..4f3e5271183d 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd"; }; + # + # Turn on "-rdb" option (REALLYDELAYBIND) by default to ensure compatibility with gs-9.22 + # + patches = [ ./pstoedit-gs-9.22-compat.patch ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch new file mode 100644 index 000000000000..64fe805d5015 --- /dev/null +++ b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch @@ -0,0 +1,13 @@ +diff --git a/src/pstoeditoptions.h b/src/pstoeditoptions.h +index 7846883..0fb6a6f 100755 +--- a/src/pstoeditoptions.h ++++ b/src/pstoeditoptions.h +@@ -453,7 +453,7 @@ private: + "Later versions of Ghostscript will probably support -dDELAYBIND again. " + "But also in that case the security risk remains. So be careful with what " + "files you process with pstoedit and Ghostscript.", +- false), // ++ true), // + #endif + pagetoextract (true, "-page","page number",g_t,"extract a specific page: 0 means all pages", + "Select a single page from a multi-page PostScript or PDF file.", |