diff options
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 59 |
1 files changed, 39 insertions, 20 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 18001ccff2..0c9cf40c65 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5211,7 +5211,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (define-public libsecret (package (name "libsecret") - (version "0.20.4") + (version "0.20.5") (source (origin (method url-fetch) (uri (string-append @@ -5220,28 +5220,47 @@ and the GLib main loop, to integrate well with GNOME applications.") "libsecret-" version ".tar.xz")) (sha256 (base32 - "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) + "0k9bs47rzb3dwvznb4179d6nw7rbzjdyd4y8hx6vazfd1wscxcrz")))) + (build-system meson-build-system) (arguments - `(#:tests? #f ; FIXME: Testing hangs. - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + (list + #:configure-flags + #~(list "-Dgtk_doc=false") ;requires gi-docgen + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "libsecret/meson.build" + ;; The test-collection test fails non-deterministically (see: + ;; https://gitlab.gnome.org/GNOME/libsecret/-/issues/80). + ((".*'test-collection',.*") "")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? test-options #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (setenv "XDG_DATA_DIRS" ;for /org/freedesktop/secrets/collection + (string-append #$output "/share:" + (getenv "XDG_DATA_DIRS"))) + (apply invoke "dbus-run-session" "--" + "meson" "test" "--print-errorlogs" "-t" "0" + test-options))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("xsltproc" ,libxslt))) + (list dbus + docbook-xml-4.2 + docbook-xsl + gettext-minimal + `(,glib "bin") ;for gdbus-codegen, etc. + gobject-introspection + libxml2 ;for XML_CATALOG_FILES + libxslt + pkg-config + python + python-dbus + python-pygobject + vala)) (propagated-inputs - (list glib)) ; required by libsecret-1.pc - (inputs - ;; The ‘build’ phase complains about missing docbook-xml-4.2 but adding it - ;; doesn't seem to affect the build result. - (list docbook-xsl libgcrypt libxml2)) ; for XML_CATALOG_FILES + (list glib libgcrypt)) ;required by libsecret-1.pc (home-page "https://wiki.gnome.org/Projects/Libsecret/") (synopsis "GObject bindings for \"Secret Service\" API") (description |