Unverified Commit 12490c80 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #121711 from raboof/inkscape-textext-init-at-1.3.1

inkscape/textext: init at 1.8.1
parents ef1e0644 2c18352f
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
, runCommand
, inkcut
, callPackage
, texlive
}:

{
@@ -43,4 +44,8 @@
    mkdir -p $out/share/inkscape/extensions
    cp ${inkcut}/share/inkscape/extensions/* $out/share/inkscape/extensions
  '');
  textext = callPackage ./extensions/textext {
    pdflatex = texlive.combined.scheme-basic;
    lualatex = texlive.combined.scheme-basic;
  };
}
+125 −0
Original line number Diff line number Diff line
{ lib
, writeScript
, fetchFromGitHub
, substituteAll
, inkscape
, pdflatex
, lualatex
, python3
, wrapGAppsHook
, gobject-introspection
, gtk3
, gtksourceview3
}:

let
  launchScript = writeScript "launch.sh" ''
    cd $(dirname $0)
    ./__main__.py $*
  '';
in
python3.pkgs.buildPythonApplication rec {
  pname = "textext";
  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "textext";
    repo = "textext";
    rev = version;
    sha256 = "sha256-Qzd39X0X3DdwZ3pIIGvEbNjl6dxjDf3idzjwCkp3WRg=";
  };

  patches = [
    # Make sure we can point directly to pdflatex in the extension,
    # instead of relying on the PATH (which might not have it)
    (substituteAll {
      src = ./fix-paths.patch;
      inherit pdflatex lualatex;
    })

    # Since we are wrapping the extension, we need to change the interpreter
    # from Python to Bash.
    ./interpreter.patch
  ];

  nativeBuildInputs = [
    wrapGAppsHook
    gobject-introspection
  ];

  buildInputs = [
    gtk3
    gtksourceview3
  ];

  propagatedBuildInputs = [
    python3.pkgs.pygobject3
    # lxml, cssselect and numpy are required by inkex but is not inherited from inkscape when we use custom Python interpreter:
    python3.pkgs.lxml
    python3.pkgs.cssselect
    python3.pkgs.numpy
  ];

  # strictDeps do not play nicely with introspection setup hooks.
  # https://github.com/NixOS/nixpkgs/issues/56943
  strictDeps = false;

  # TexText doesn’t have a 'bdist_wheel' target.
  dontUseSetuptoolsBuild = true;

  # TexText doesn’t have a 'test' target.
  doCheck = false;

  # Avoid wrapping two times by just using Python’s wrapping.
  dontWrapGApps = true;

  buildPhase = ''
    runHook preBuild

    mkdir dist

    # source/setup.py creates a config file in HOME (that we ignore)
    mkdir buildhome
    export HOME=$(pwd)/buildhome

    python setup.py \
      --inkscape-executable=${inkscape}/bin/inkscape \
      --pdflatex-executable=${pdflatex}/bin/pdflatex \
      --lualatex-executable=${lualatex}/bin/lualatex \
      --inkscape-extensions-path=dist

    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall

    mkdir -p $out/share/inkscape/extensions
    cp -r dist/textext $out/share/inkscape/extensions

    runHook postInstall
  '';

  preFixup = ''
    # Prepare for wrapping
    chmod +x "$out/share/inkscape/extensions/textext/__main__.py"
    sed -i '1i#!/usr/bin/env python3' "$out/share/inkscape/extensions/textext/__main__.py"

    # Include gobject-introspection typelibs in the wrapper.
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';

  postFixup = ''
    # Wrap the project so it can find runtime dependencies.
    wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out $pythonPath"
    cp ${launchScript} $out/share/inkscape/extensions/textext/launch.sh
  '';

  meta = with lib; {
    description = "Re-editable LaTeX graphics for Inkscape";
    homepage = "https://textext.github.io/textext/";
    license = licenses.bsd3;
    maintainers = [ maintainers.raboof ];
    platforms = platforms.all;
  };
}
+19 −0
Original line number Diff line number Diff line
--- a/textext/base.py
+++ b/textext/base.py
@@ -95,7 +95,16 @@ class TexText(inkex.EffectExtension):
     def __init__(self):
 
         self.config = Settings(directory=defaults.textext_config_path)
+        # config.json is stored in ~/.config/inkscape/extensions/textext for
+        # the next invocation, but since that next invocation could be using
+        # a different latex derivation, make sure we overwrite the executable
+        # paths with updated ones:
+        self.config["pdflatex-executable"] = "@pdflatex@/bin/pdflatex";
+        self.config["lualatex-executable"] = "@lualatex@/bin/lualatex";
         self.cache = Cache(directory=defaults.textext_config_path)
+        if "requirements_checker" in self.cache.values:
+            self.cache["requirements_checker"]["available_tex_to_pdf_converters"]["pdflatex"] = "@pdflatex@/bin/pdflatex";
+            self.cache["requirements_checker"]["available_tex_to_pdf_converters"]["lualatex"] = "@lualatex@/bin/lualatex";
         previous_exit_code = self.cache.get("previous_exit_code", None)
 
         if previous_exit_code is None:
+10 −0
Original line number Diff line number Diff line
--- a/textext/textext.inx
+++ b/textext/textext.inx
@@ -8,6 +8,6 @@
     </effects-menu>
   </effect>
   <script>
-    <command location="inx" interpreter="python">__main__.py</command>
+    <command location="inx" interpreter="shell">launch.sh</command>
   </script>
 </inkscape-extension>