guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

36/77: gnu: geocode-glib: Update to 3.26.0.


From: Ricardo Wurmus
Subject: 36/77: gnu: geocode-glib: Update to 3.26.0.
Date: Mon, 6 Aug 2018 14:29:20 -0400 (EDT)

rekado pushed a commit to branch wip-gnome-upgrades
in repository guix.

commit 96a7bf9526ab3dbaec6d20826f60d2799cd9dd2b
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Aug 6 11:22:23 2018 +0200

    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 bbb6679..5302f7a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2915,7 +2915,7 @@ permission from user.")
 (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/"
@@ -2923,15 +2923,24 @@ permission from user.")
                                   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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]