Skip to content

Commit

Permalink
Merge pull request #303748 from TuxCoder/inkscape_eps
Browse files Browse the repository at this point in the history
inkscape: fix path patch
  • Loading branch information
jtojnar authored Jun 1, 2024
2 parents 90f6359 + fae8ec3 commit c753576
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
3 changes: 3 additions & 0 deletions pkgs/applications/graphics/inkscape/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, boehmgc
, boost
, cairo
, callPackage
, cmake
, desktopToDarwinBundle
, fetchurl
Expand Down Expand Up @@ -172,6 +173,8 @@ stdenv.mkDerivation rec {
done
'';

passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { };

meta = with lib; {
description = "Vector graphics editor";
homepage = "https://www.inkscape.org";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.
<id>org.inkscape.input.eps</id>
<dependency type="extension">org.inkscape.input.pdf</dependency>
- <dependency type="executable" location="path">ps2pdf</dependency>
+ <dependency type="executable" location="path">@ghostscript@/bin/ps2pdf</dependency>
+ <dependency type="executable" location="absolute">@ghostscript@/bin/ps2pdf</dependency>
<param name="crop" type="bool" gui-hidden="true">true</param>
<param name="autorotate" type="optiongroup" appearance="combo" gui-text="Determine page orientation from text direction"
gui-description="The PS/EPS importer can try to determine the page orientation such that the majority of the text runs left-to-right.">
Expand All @@ -18,7 +18,7 @@ diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.i
<id>org.inkscape.input.postscript_input</id>
<dependency type="extension">org.inkscape.input.pdf</dependency>
- <dependency type="executable" location="path">ps2pdf</dependency>
+ <dependency type="executable" location="path">@ghostscript@/bin/ps2pdf</dependency>
+ <dependency type="executable" location="absolute">@ghostscript@/bin/ps2pdf</dependency>
<param name="autorotate" type="optiongroup" appearance="combo" gui-text="Determine page orientation from text direction"
gui-description="The PS/EPS importer can try to determine the page orientation such that the majority of the text runs left-to-right.">
<option value="None">Disabled</option>
Expand Down
27 changes: 27 additions & 0 deletions pkgs/applications/graphics/inkscape/test-ps2pdf-plugin.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ inkscape, runCommand, writeTextFile }:

let
svg_file = writeTextFile {
name = "test.svg";
text = ''
<?xml version="1.0" encoding="UTF-8"?>
<svg width="50" height="50" version="1.1">
<ellipse cx="1" cy="1" rx="1" ry="1" />
</svg>'';
};
in
runCommand "inkscape-test-eps"
{
nativeBuildInputs = [ inkscape ];
} ''
echo ps test
inkscape ${svg_file} --export-type=ps -o test.ps
inkscape test.ps -o test.ps.svg
echo eps test
inkscape ${svg_file} --export-type=eps -o test.eps
inkscape test.eps -o test.eps.svg
# inkscape does not return an error code, only does not create files
[[ -f test.ps.svg && -f test.eps.svg ]] && touch $out
''

0 comments on commit c753576

Please sign in to comment.