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

gnu: gnome-maps: Update to 3.30.3.1. 

* gnu/packages/geo.scm (gnome-maps): Update to 3.30.3.1.
[inputs]: Replace gdk-pixbuf with gdk-pixbuf+svg and gnome-online-accounts
with gnome-online-accounts:lib.
[arguments]: Adjust 'wrap' phase accordingly.
This commit is contained in:
Kei Kebreau 2019-07-28 08:49:00 -04:00
parent ccad0e4d69
commit 2cf1e37c10
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/geo.scm
View File

@ -108,7 +108,7 @@ topology functions.")
(define-public gnome-maps (define-public gnome-maps
(package (package
(name "gnome-maps") (name "gnome-maps")
(version "3.30.2.1") (version "3.30.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -116,7 +116,7 @@ topology functions.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57")))) "0xqk3yrds0w8bjmpf4jw0370phvm65av82nqrx7fp1648h9nq7xi"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -130,8 +130,11 @@ topology functions.")
(assoc-ref inputs "geocode-glib") (assoc-ref inputs "geocode-glib")
"/lib")) "/lib"))
(goa-path (string-append (goa-path (string-append
(assoc-ref inputs "gnome-online-accounts") (assoc-ref inputs "gnome-online-accounts:lib")
"/lib")) "/lib"))
(gdk-pixbuf-path (string-append
(assoc-ref inputs "gdk-pixbuf")
"/lib"))
(webkitgtk-path (string-append (webkitgtk-path (string-append
(assoc-ref inputs "webkitgtk") (assoc-ref inputs "webkitgtk")
"/lib"))) "/lib")))
@ -140,9 +143,11 @@ 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, ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37,
;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0 ;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18, and
;; libgeocode-glib.so.0
`("LD_LIBRARY_PATH" ":" prefix (,goa-path `("LD_LIBRARY_PATH" ":" prefix (,goa-path
,webkitgtk-path ,webkitgtk-path
,gdk-pixbuf-path
,geocode-glib-path))) ,geocode-glib-path)))
#t)))))) #t))))))
(native-inputs (native-inputs
@ -158,14 +163,14 @@ topology functions.")
("libsoup" ,libsoup) ("libsoup" ,libsoup)
("libgweather" ,libgweather) ("libgweather" ,libgweather)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf+svg)
("glib-networking" ,glib-networking) ("glib-networking" ,glib-networking)
("geoclue" ,geoclue) ("geoclue" ,geoclue)
("geocode-glib" ,geocode-glib) ("geocode-glib" ,geocode-glib)
("gfbgraph" ,gfbgraph) ("gfbgraph" ,gfbgraph)
("gjs" ,gjs) ("gjs" ,gjs)
("glib" ,glib) ("glib" ,glib)
("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)))