From a7dd0c02cc5820ceabf0f7cc34c8986aa21cda84 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Aug 2018 11:22:23 +0200 Subject: [PATCH] gnu: geocode-glib: Update to 3.26.0. * gnu/packages/gnome.scm (geocode-glib): Update to 3.26.0. [build-system]: Use meson-build-system. [arguments]: Enable tests; add phase "set-locales". [native-inputs]: Add glibc-locales, gettext-minimal, and gtk-doc. --- gnu/packages/gnome.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 842d7895dd..ce524f205c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3029,7 +3029,7 @@ (define-public geoclue (define-public geocode-glib (package (name "geocode-glib") - (version "3.20.1") + (version "3.26.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/geocode-glib/" @@ -3037,15 +3037,24 @@ (define-public geocode-glib name "-" version ".tar.xz")) (sha256 (base32 - "18iphsx3bybw7lssbb7rxc1rrnsc8vxai521zkqc535zr8rci7v6")))) - (build-system gnu-build-system) + "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a")))) + (build-system meson-build-system) (arguments - `(;; The tests want to write to $HOME/.cache/geocode-glib, which doesn't - ;; work for the builder. Punt. - #:tests? #f)) + `(#:phases + (modify-phases %standard-phases + ;; The tests require a bunch of locales. + (add-before 'check 'set-locales + (lambda* (#:key inputs #:allow-other-keys) + (setenv "GUIX_LOCPATH" + (string-append (assoc-ref inputs "glibc-locales") + "/lib/locale")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums + ("glibc-locales" ,glibc-locales) ; for tests + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("json-glib" ,json-glib))) (propagated-inputs