gnu: gnome-maps: Update to 3.26.2.
* gnu/packages/geo.scm (gnome-maps): Update to 3.26.2. [arguments]: In 'install' phase, add webkitgtk to LD_LIBRARY_PATH.master
parent
4dd137d508
commit
67bd376b1a
|
@ -75,7 +75,7 @@ topology functions.")
|
||||||
(define-public gnome-maps
|
(define-public gnome-maps
|
||||||
(package
|
(package
|
||||||
(name "gnome-maps")
|
(name "gnome-maps")
|
||||||
(version "3.24.3")
|
(version "3.26.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
@ -83,29 +83,33 @@ topology functions.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1mnhcrawdp6fyqylh0m8l259xdd7pqwibrjyl54rmsvnm8vfrwsy"))))
|
"0l40l7m9dyphvasiq1jxrn6ivavs1xwzn0bzz2x1z7x73955q783"))))
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags ; Ensure that geoclue is referred to by output.
|
`(#:configure-flags ;; Ensure that geoclue is referred to by output.
|
||||||
(list (string-append "LDFLAGS=-L"
|
(list (string-append "LDFLAGS=-L"
|
||||||
(assoc-ref %build-inputs "geoclue") "/lib")
|
(assoc-ref %build-inputs "geoclue") "/lib")
|
||||||
(string-append "CFLAGS=-I"
|
(string-append "CFLAGS=-I"
|
||||||
(assoc-ref %build-inputs "geoclue") "/include"))
|
(assoc-ref %build-inputs "geoclue") "/include"))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after
|
(add-after 'install 'wrap
|
||||||
'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"))
|
||||||
(goa-path (string-append
|
(goa-path (string-append
|
||||||
(assoc-ref inputs "gnome-online-accounts")
|
(assoc-ref inputs "gnome-online-accounts")
|
||||||
|
"/lib"))
|
||||||
|
(webkitgtk-path (string-append
|
||||||
|
(assoc-ref inputs "webkitgtk")
|
||||||
"/lib")))
|
"/lib")))
|
||||||
(wrap-program (string-append out "/bin/gnome-maps")
|
(wrap-program (string-append out "/bin/gnome-maps")
|
||||||
`("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 libgoa-1.0.so.0.
|
;; There seems to be no way to embed the path of
|
||||||
`("LD_LIBRARY_PATH" ":" prefix (,goa-path)))
|
;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37 and
|
||||||
|
;; libjavascriptcoregtk-4.0.so.18.
|
||||||
|
`("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path)))
|
||||||
#t))))))
|
#t))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gobject-introspection" ,gobject-introspection)
|
`(("gobject-introspection" ,gobject-introspection)
|
||||||
|
|
Loading…
Reference in New Issue