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

gnu: gnome-maps: Properly wrap GI_TYPELIB_PATH.

Browse source 
This fixes a bug reported by pkill9 and tschilptschilp23 in IRC.
See <http://logs.guix.gnu.org/guix/2022-10-01.log#031053> and
<http://logs.guix.gnu.org/guix/2022-10-05.log#214334>.
It does so by using a snippet that's also applied in gnome-shell.

* gnu/packages/geo.scm (gnome-maps)[#:phases]: Remove ‘patch-dbus-service’.
Update ‘wrap’ so that it uses GJS-specific wrapping code rather than
wrap-program.
This commit is contained in:
Liliana Marie Prikler 2022-10-05 21:59:36 +02:00
parent ccbeb3fde6
commit 9be5f88e18
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/geo.scm
View file

@ -280,15 +280,16 @@ (define-public gnome-maps
"update_desktop_database"))
(string-append option ": false"))
(else all))))))
(add-after 'unpack 'patch-dbus-service
(lambda _
(substitute* "data/org.gnome.Maps.service.in"
(("@pkgdatadir@/org.gnome.Maps")
(string-append #$output "/bin/gnome-maps")))))
(add-after 'install 'wrap
(lambda _
(wrap-program (string-append #$output "/bin/gnome-maps")
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))))))))
(let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(substitute* (string-append #$output "/share/gnome-maps/"
"org.gnome.Maps")
(("imports\\.package\\.init" all)
(string-append "'" gi-typelib-path "'.split(':').forEach("
"path => imports.gi.GIRepository.Repository."
"prepend_search_path(path));\n"
all)))))))))
(native-inputs
(list gettext-minimal
`(,glib "bin")