ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: inkscape/stable: Update to 1.2.1.

Browse source 
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
[arguments, inputs]: Take the changes from ...
(inkscape): ... this variable, and adjust this one accordingly.
This commit is contained in:
Marius Bakke 2022-07-27 22:25:39 +02:00
parent 12c9e59600
commit da51ffafc7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/inkscape.scm
View file

@ -60,7 +60,7 @@ (define-public inkscape/stable
(hidden-package (hidden-package
(package (package
(name "inkscape") (name "inkscape")
(version "1.1.1") (version "1.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -68,7 +68,7 @@ (define-public inkscape/stable
"resources/file/" "resources/file/"
"inkscape-" version ".tar.xz")) "inkscape-" version ".tar.xz"))
(sha256 (sha256
(base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf")) (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 format))) (ice-9 format)))
(snippet (snippet
@ -204,27 +204,33 @@ (define-public inkscape/stable
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (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 (add-after 'install 'wrap-program
;; Ensure Python is available at runtime. ;; Ensure Python is available at runtime.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape") (wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" ":" prefix `("GUIX_PYTHONPATH" prefix
(,(getenv "GUIX_PYTHONPATH")))))))))) (,(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"))))))))))
(inputs (inputs
`(("aspell" ,aspell) `(("aspell" ,aspell)
("autotrace" ,autotrace) ("autotrace" ,autotrace)
("bash-minimal" ,bash-minimal)
("gdl" ,gdl-minimal) ("gdl" ,gdl-minimal)
("gtkmm" ,gtkmm-3) ("gtkmm" ,gtkmm-3)
("gtk" ,gtk+) ("gtk" ,gtk+)
("gtkspell3" ,gtkspell3) ("gtkspell3" ,gtkspell3)
("gsl" ,gsl) ("gsl" ,gsl)
("poppler" ,poppler) ("poppler" ,poppler)
("lib2geom" ,lib2geom) ("lib2geom" ,lib2geom-1.2)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng) ("libpng" ,libpng)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libgc" ,libgc) ("libgc" ,libgc)
("librsvg" ,librsvg) ;for the pixbuf loader
("libsoup" ,libsoup-minimal-2) ("libsoup" ,libsoup-minimal-2)
("libcdr" ,libcdr) ("libcdr" ,libcdr)
("libvisio" ,libvisio) ("libvisio" ,libvisio)
@ -268,24 +274,4 @@ (define-public inkscape
"inkscape-" version ".tar.xz")) "inkscape-" version ".tar.xz"))
(sha256 (sha256
(base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
(build-system cmake-build-system)
(arguments
(substitute-keyword-arguments (package-arguments inkscape/stable)
((#:phases phases)
`(modify-phases ,phases
(replace '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")
`("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")))))))))))
(inputs (modify-inputs (package-inputs inkscape/stable)
(replace "lib2geom" lib2geom-1.2)
(append bash-minimal
librsvg))) ;for the pixbuf loader
(properties (alist-delete 'hidden? (package-properties inkscape/stable))))) (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))