diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2019-07-19 16:43:49 -0400 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2019-12-07 14:04:09 -0500 |
| commit | e8a26caa14ed6717a6d692ca0fad2c60a802f125 (patch) | |
| tree | 301f98d2ea4ff6ce26093d2aad6d54ca26a07fe3 /gnu/packages/gnome.scm | |
| parent | 5c610d4f7f46593782c88e0f9b2d01a5d015a4c5 (diff) | |
gnu: gnome-desktop: Update to 3.32.2.
* gnu/packages/gnome.scm (gnome-desktop): Update to 3.32.2.
[build-system]: Use meson-build-system.
[arguments]: Add 'pre-check' phase.
[native-inputs]: Add glib:bin, glibc-locales and xorg-server-for-tests.
[inputs]: Move iso-codes, libseccomp, libx11 and xkeyboard-config...
[propagated-inputs]: ...here.
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4b42c679be..26ca0dea68 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -475,7 +475,7 @@ commonly used macros.") (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.30.2") + (version "3.32.2") (source (origin (method url-fetch) @@ -484,8 +484,8 @@ commonly used macros.") name "-" version ".tar.xz")) (sha256 (base32 - "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal")))) - (build-system gnu-build-system) + "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9")))) + (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -495,27 +495,39 @@ commonly used macros.") (substitute* "libgnome-desktop/gnome-languages.c" (("\"locale\"") (string-append "\"" libc "/bin/locale\""))) - #t)))))) + #t))) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests require a running X server and locales. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (setenv "GUIX_LOCPATH" + (string-append (assoc-ref inputs "glibc-locales") + "/lib/locale")) + #t))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("glib:bin" ,glib "bin") ; for gdbus-codegen + ("glibc-locales" ,glibc-locales) ; for tests + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("xmllint" ,libxml2))) + ("xmllint" ,libxml2) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs ;; Required by gnome-desktop-3.0.pc. `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+))) - (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) ("libseccomp" ,libseccomp) ("libx11" ,libx11) + ("xkeyboard-config" ,xkeyboard-config))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) ("libxext" ,libxext) ("libxkbfile" ,libxkbfile) - ("libxrandr" ,libxrandr) - ("xkeyboard-config" ,xkeyboard-config))) + ("libxrandr" ,libxrandr))) (home-page "https://www.gnome.org/") (synopsis "Libgnome-desktop, gnome-about, and desktop-wide documents") |