[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68813] [core-updates PATCH 19/20] gnu: inkscape: Fix Python support
From: |
Maxim Cournoyer |
Subject: |
[bug#68813] [core-updates PATCH 19/20] gnu: inkscape: Fix Python support. |
Date: |
Thu, 22 Feb 2024 11:10:18 -0500 |
* gnu/packages/inkscape.scm (inkscape/stable)
[phases]: Wrap with PATH and GI_TYPELIB_PATH.
[inputs]: Sort inputs. Add python-appdirs, python-cssselect, python-pygobject
and python-requests.
(inkscape) [inputs]: Do not append python-cssselect.
Fixes: https://issues.guix.gnu.org/63938
Change-Id: I90a39a04a35dbcafe413726107d100c78d173fd0
---
gnu/packages/inkscape.scm | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 5449bf8d92..aa33a0a4a3 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -245,14 +245,19 @@ (define-public inkscape/stable
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
(add-after 'install 'wrap-program
;; Ensure Python is available at runtime.
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(wrap-program (string-append #$output "/bin/inkscape")
+ `("PATH" prefix
+ (,(dirname (search-input-file inputs "bin/python"))))
`("GUIX_PYTHONPATH" prefix
(,(getenv "GUIX_PYTHONPATH")))
;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
;; its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" =
- (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
+ (,(getenv "GDK_PIXBUF_MODULE_FILE")))
+ ;; Ensure GObject Introspection typelibs are found.
+ `("GI_TYPELIB_PATH" ":" prefix
+ (,(getenv "GI_TYPELIB_PATH")))))))))
(inputs
(list (librsvg-for-system) ;for the pixbuf loader
autotrace
@@ -279,9 +284,16 @@ (define-public inkscape/stable
poppler
popt
potrace
+ ;; These Python dependencies are used by the Inkscape extension
+ ;; management system. To verify that it is working, visit the
+ ;; Extensions -> Manage Extensions... menu.
+ python-appdirs
+ python-cssselect
python-lxml
python-numpy
+ python-pygobject
python-pyserial
+ python-requests
python-scour
python-wrapper
readline))
@@ -337,8 +349,7 @@ (define-public inkscape
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
(inputs (modify-inputs (package-inputs inkscape/stable)
- (append imagemagick ;for libMagickCore and libMagickWand
- python-cssselect))) ;to render qrcode
+ (append imagemagick))) ;for libMagickCore and libMagickWand
(native-inputs
(modify-inputs (package-native-inputs inkscape/stable)
;; Only use 1 imagemagick across the package build.
--
2.41.0
- [bug#68813] [core-updates PATCH 00/20] Replace pkg-config with pkgconf to reduce propagation / Inkscape updates, Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 03/20] gnu: Add kyua., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 05/20] gnu: Add pkgconf-as-pkg-config., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 14/20] gnu: lib2geom: Update to 1.3., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 16/20] gnu: lib2geom: Use gexps and remove input labels., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 11/20] gnu: autotrace: Remove libtool archives., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 04/20] gnu: pkgconf: Enable test suite., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 19/20] gnu: inkscape: Fix Python support.,
Maxim Cournoyer <=
- [bug#68813] [core-updates PATCH 15/20] gnu: inkscape: Truly enable ImageMagic support., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 13/20] gnu: gd: Update to 2.3.3., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 08/20] gnu: pkg-config: Alias to pkgconf-as-pkg-config., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 12/20] gnu: autotrace: Fix pkg-config file., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 07/20] gnu: pkgconf: Add support for cross-compilation., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 10/20] gnu: autotrace: Update to 0.31.10., Maxim Cournoyer, 2024/02/22
- [bug#68813] [core-updates PATCH 17/20] gnu: inkscape: Update to 1.3.2., Maxim Cournoyer, 2024/02/22