ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-17 00:18:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: pitivi: Propagate librsvg.

Browse source 
Fixes <https://issues.guix.gnu.org/56288>.

* gnu/packages/video.scm (pitivi)[native-inputs]: Use new style, relocate
before inputs.
[inputs]: Add bash-minimal, for wrap-program.  Move librsvg to...
[propagated-inputs]: ... this new field.
[phases]{wrap-other-dependencies}: Use search-input-file to find output
binary.

Reported-by: Christian Miller <miller.christian@proton.me>
This commit is contained in:
Maxim Cournoyer 2022-07-07 11:35:32 -04:00
parent 6428f854f9
commit 47f0b3ad14
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/video.scm
View file

@ -4340,8 +4340,14 @@ (define-public pitivi
(sha256 (sha256
(base32 "08x2fs2bak1fbmkvjijgx1dsawispv91bpv5j5gkqbv5dfgf7wah")))) (base32 "08x2fs2bak1fbmkvjijgx1dsawispv91bpv5j5gkqbv5dfgf7wah"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs
(list gettext-minimal
`(,glib "bin")
itstool
pkg-config))
(inputs (inputs
(list glib (list bash-minimal
glib
gst-editing-services gst-editing-services
gstreamer gstreamer
gst-plugins-base gst-plugins-base
@ -4353,7 +4359,6 @@ (define-public pitivi
gst-libav gst-libav
gsound gsound
gtk+ gtk+
librsvg
libpeas libpeas
libnotify libnotify
pango pango
@ -4363,27 +4368,23 @@ (define-public pitivi
python-matplotlib python-matplotlib
python-pycairo python-pycairo
python-pygobject)) python-pygobject))
(native-inputs ;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
`(("gettext" ,gettext-minimal) ;; otherwise pitivi fails to launch.
("glib:bin" ,glib "bin") (propagated-inputs (list librsvg))
("itstool" ,itstool)
("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'glib-or-gtk-wrap 'wrap-other-dependencies (add-after 'glib-or-gtk-wrap 'wrap-other-dependencies
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out") (wrap-program (search-input-file outputs "bin/pitivi")
"/bin/pitivi"))) `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
(wrap-program prog `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) ;; We've only added inputs for what Pitivi deems either
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) ;; necessary or optional. Let the user's packages take
;; We've only added inputs for what Pitivi deems either ;; precedence in case they have e.g. the full gst-plugins-bad.
;; necessary or optional. Let the user's packages take `("GST_PLUGIN_SYSTEM_PATH" suffix
;; precedence in case they have e.g. the full gst-plugins-bad. (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
`("GST_PLUGIN_SYSTEM_PATH" suffix
(,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))))))
(home-page "http://www.pitivi.org") (home-page "http://www.pitivi.org")
(synopsis "Video editor based on GStreamer Editing Services") (synopsis "Video editor based on GStreamer Editing Services")
(description "Pitivi is a video editor built upon the GStreamer Editing (description "Pitivi is a video editor built upon the GStreamer Editing