nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gnome-maps: Fix runtime error. 

Fixes <https://bugs.gnu.org/35761>.

* gnu/packages/geo.scm (gnome-maps)[arguments]: Add lib output of
gnome-online-accounts and geocode-glib to LD_LIBRARY_PATH.
[inputs]: Add gnome-online-accounts:lib.
This commit is contained in:
Ricardo Wurmus 2019-08-07 19:02:10 +02:00
parent fdc0688cba
commit 9fa7c20be9
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/geo.scm
View File

@ -131,7 +131,12 @@ topology functions.")
(gi-typelib-path (getenv "GI_TYPELIB_PATH")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(goa-path (string-append (goa-path (string-append
(assoc-ref inputs "gnome-online-accounts") (assoc-ref inputs "gnome-online-accounts")
"/lib:"
(assoc-ref inputs "gnome-online-accounts:lib")
"/lib")) "/lib"))
(geocode-glib-path (string-append
(assoc-ref inputs "geocode-glib")
"/lib"))
(webkitgtk-path (string-append (webkitgtk-path (string-append
(assoc-ref inputs "webkitgtk") (assoc-ref inputs "webkitgtk")
"/lib"))) "/lib")))
@ -141,7 +146,8 @@ topology functions.")
;; There seems to be no way to embed the path of ;; There seems to be no way to embed the path of
;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37 and ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37 and
;; libjavascriptcoregtk-4.0.so.18. ;; libjavascriptcoregtk-4.0.so.18.
`("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path))) `("LD_LIBRARY_PATH" ":" prefix
(,goa-path ,webkitgtk-path ,geocode-glib-path)))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) `(("gobject-introspection" ,gobject-introspection)
@ -163,6 +169,7 @@ topology functions.")
("gjs" ,gjs) ("gjs" ,gjs)
("glib" ,glib) ("glib" ,glib)
("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts" ,gnome-online-accounts)
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("rest" ,rest) ("rest" ,rest)
("webkitgtk" ,webkitgtk))) ("webkitgtk" ,webkitgtk)))