From 24b233d45c2a04a7a011397234b29fd5d7133110 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 25 Oct 2020 12:23:24 +0000 Subject: [PATCH] gnu: inkscape: Correct extension dependencies. * gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Add wrap-program phase. [inputs]: Move python-wrapper to inputs, and add several python libraries. [native-inputs]: Remove python-wrapper, as it has moved to inputs. Signed-off-by: Christopher Baines --- gnu/packages/inkscape.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 4ac3cf3966..56375f0759 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +45,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages xml) #:use-module (gnu packages ghostscript) #:use-module (gnu packages fontutils) @@ -250,7 +252,14 @@ endif()~%~%" (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'install 'wrap-program + ;; Ensure Python is available at runtime. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/inkscape") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) + #t))))) (inputs `(("aspell" ,aspell) ("autotrace" ,autotrace) @@ -275,15 +284,19 @@ endif()~%~%" ("popt" ,popt) ("potrace" ,potrace) ("lcms" ,lcms) - ("boost" ,boost))) + ("boost" ,boost) + ("python" ,python-wrapper) + ("python-scour" ,python-scour) + ("python-pyserial" ,python-pyserial) + ("python-numpy" ,python-numpy) + ("python-lxml" ,python-lxml))) (native-inputs `(("imagemagick" ,imagemagick) ;for tests ("intltool" ,intltool) ("glib" ,glib "bin") ("googletest" ,googletest) ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("pkg-config" ,pkg-config))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") (description "Inkscape is a vector graphics editor. What sets Inkscape