mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
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 <mail@cbaines.net>
This commit is contained in:
parent
572c59a7a1
commit
24b233d45c
1 changed files with 17 additions and 4 deletions
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
|
||||
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -44,6 +45,7 @@ (define-module (gnu packages inkscape)
|
|||
#: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 @@ (define-public inkscape-1.0
|
|||
(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 @@ (define-public inkscape-1.0
|
|||
("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
|
||||
|
|
Loading…
Reference in a new issue