diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-10 18:02:31 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-13 00:20:39 -0400 |
| commit | 0884238e1518f68e7d35b78dc2815fb35a3e641e (patch) | |
| tree | d41cce9cc16314501656cadc23e222a40e9e681e /gnu/packages/gnome.scm | |
| parent | 69df14a02644cba77e1075bdc909058fc706edd3 (diff) | |
gnu: gnome-shell: Update to 42.4.
* gnu/packages/gnome.scm (gnome-shell): Update to 42.4.
[source](patches): Remove.
[arguments]: Adjust substitution to disable GTK icon cache. Filter disallowed
references from GUIX_PYTHONPATH. While at it, also prevent MESON from ending
up in the closure.
[inputs]: Change from LIBGWEATHER to LIBGWEATHER4.
* gnu/packages/patches/gnome-shell-polkit-autocleanup.patch:
* gnu/local.mk (dist_patch_DATA):
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 72aee87514..c9f2d1fcbc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8853,21 +8853,21 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "41.0") + (version "42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major version) "/" name "-" version ".tar.xz")) - (patches (search-patches "gnome-shell-polkit-autocleanup.patch")) (sha256 (base32 - "0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj")))) + "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7")))) (build-system meson-build-system) (arguments (let ((disallowed-references (list (gexp-input glib "bin") (gexp-input libxslt) + (gexp-input meson) (gexp-input ruby-sass)))) (list #:glib-or-gtk? #t @@ -8880,7 +8880,8 @@ properties, screen resolution, and other GNOME parameters.") #:modules '((guix build meson-build-system) (guix build utils) (ice-9 match) - (srfi srfi-1)) + (srfi srfi-1) + (srfi srfi-26)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-keysdir @@ -8894,8 +8895,9 @@ properties, screen resolution, and other GNOME parameters.") (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson/postinstall.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-before 'configure 'record-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((ibus-daemon (search-input-file inputs "bin/ibus-daemon")) @@ -8916,7 +8918,13 @@ properties, screen resolution, and other GNOME parameters.") (add-after 'install 'wrap-programs (lambda* (#:key inputs #:allow-other-keys) (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "GUIX_PYTHONPATH"))) + (python-path + (string-join + (filter (lambda (item) + (not (any (cut string-prefix? <> item) + '#$disallowed-references))) + (string-split (getenv "GUIX_PYTHONPATH") #\:)) + ":"))) (for-each (lambda (prog) (wrap-program (string-append #$output "/bin/" prog) @@ -8996,7 +9004,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ libcanberra libcroco libgnomekbd ;for gkbd-keyboard-display - libgweather + libgweather4 libnma libsoup mesa-headers |