Unverified Commit 0db4b995 authored by Nikolay Korotkiy's avatar Nikolay Korotkiy
Browse files

inkscape: fix broken patching

parent 90044aeb

pkgs/applications/graphics/inkscape/default.nix

+9 −7
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, boost

, cairo

, cmake

, desktopToDarwinBundle

, fetchurl

, gettext

, ghostscript
@@ -78,16 +79,15 @@ stdenv.mkDerivation rec { 
      # e.g., those from the "Effects" menu.

      python3 = "${python3Env}/bin/python";

    })

    (substituteAll {

      # Fix path to ps2pdf binary

      src = ./fix-ps2pdf-path.patch;

      inherit ghostscript;

    })

  ];



  postPatch = ''

    patchShebangs share/extensions

    substituteInPlace share/extensions/eps_input.inx \

      --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf"

    substituteInPlace share/extensions/ps_input.inx \

      --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf"

    substituteInPlace share/extensions/ps_input.py \

      --replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'"

    patchShebangs share/templates

    patchShebangs man/fix-roff-punct
@@ -107,7 +107,9 @@ stdenv.mkDerivation rec { 
  ] ++ (with perlPackages; [

    perl

    XMLParser

  ]);

  ]) ++ lib.optionals stdenv.isDarwin [

    desktopToDarwinBundle

  ];



  buildInputs = [

    boehmgc

pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.inx inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/eps_input.inx

--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.inx	2023-08-02 22:22:32.000000000 +0400

+++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/eps_input.inx	2023-08-02 22:23:34.000000000 +0400

@@ -3,7 +3,7 @@

     <name>EPS Input</name>

     <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>

     <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.">

diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.inx inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.inx

--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.inx	2023-08-02 22:22:33.000000000 +0400

+++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.inx	2023-08-02 22:24:00.000000000 +0400

@@ -3,7 +3,7 @@

     <name>PostScript Input</name>

     <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>

     <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>

diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.py inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.py

--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.py	2023-08-02 22:22:32.000000000 +0400

+++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.py	2023-08-02 22:23:48.000000000 +0400

@@ -79,7 +79,7 @@

         else:

             try:

                 call(

-                    "ps2pdf",

+                    "@ghostscript@/bin/ps2pdf",

                     crop,

                     "-dAutoRotatePages=/" + self.options.autorotate,

                     input_file,