guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: gnome-maps: Update to 3.30.2.1.

Browse source 
* gnu/packages/geo.scm (gnome-maps): Update to 3.30.2.1.
[build-system]: Use meson-build-system.
[arguments]: Remove configure flags; set glib-or-gtk? flag; update "wrap"
phase.
[native-inputs]: Add gtk+:bin.
This commit is contained in:
Ricardo Wurmus 2018-12-06 23:26:25 +01:00 committed by Kei Kebreau
parent 9b848f0364
commit 5339d2bbeb
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/geo.scm
View file

@ -29,6 +29,7 @@
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system scons) #:use-module (guix build-system scons)
#:use-module (guix build-system r) #:use-module (guix build-system r)
@ -103,7 +104,7 @@ topology functions.")
(define-public gnome-maps (define-public gnome-maps
(package (package
(name "gnome-maps") (name "gnome-maps")
(version "3.28.2") (version "3.30.2.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 "/"
@ -111,20 +112,19 @@ topology functions.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7")))) "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57"))))
(build-system glib-or-gtk-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags ;; Ensure that geoclue is referred to by output. `(#:glib-or-gtk? #t
(list (string-append "LDFLAGS=-L"
(assoc-ref %build-inputs "geoclue") "/lib")
(string-append "CFLAGS=-I"
(assoc-ref %build-inputs "geoclue") "/include"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(geocode-glib-path (string-append
(assoc-ref inputs "geocode-glib")
"/lib"))
(goa-path (string-append (goa-path (string-append
(assoc-ref inputs "gnome-online-accounts") (assoc-ref inputs "gnome-online-accounts")
"/lib")) "/lib"))
@ -135,12 +135,15 @@ topology functions.")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
;; 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,
;; libjavascriptcoregtk-4.0.so.18. ;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0
`("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) `(("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool) ("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs