Merge gnomeExtensions.applications-menu: fix GMenu import (#408102)

authored by Jan Tojnar and committed by GitHub 78a9dbce ac60d61e

+29
+12
pkgs/desktops/gnome/extensions/extensionOverrides.nix
··· 6 6 easyeffects, 7 7 gjs, 8 8 glib, 9 + gnome-menus, 9 10 nautilus, 10 11 gobject-introspection, 11 12 hddtemp, ··· 47 48 # the upstream repository's sources. 48 49 super: 49 50 lib.trivial.pipe super [ 51 + (patchExtension "apps-menu@gnome-shell-extensions.gcampax.github.com" (old: { 52 + patches = [ 53 + (replaceVars 54 + ./extensionOverridesPatches/apps-menu_at_gnome-shell-extensions.gcampax.github.com.patch 55 + { 56 + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; 57 + } 58 + ) 59 + ]; 60 + })) 61 + 50 62 (patchExtension "caffeine@patapon.info" (old: { 51 63 meta.maintainers = with lib.maintainers; [ eperuffo ]; 52 64 }))
+17
pkgs/desktops/gnome/extensions/extensionOverridesPatches/apps-menu_at_gnome-shell-extensions.gcampax.github.com.patch
··· 1 + diff --git a/extension.js b/extension.js 2 + index c608441..2b25335 100644 3 + --- a/extension.js 4 + +++ b/extension.js 5 + @@ -9,7 +9,11 @@ import Atk from 'gi://Atk'; 6 + import Clutter from 'gi://Clutter'; 7 + import Gio from 'gi://Gio'; 8 + import GLib from 'gi://GLib'; 9 + -import GMenu from 'gi://GMenu'; 10 + + 11 + +import GIRepository from 'gi://GIRepository'; 12 + +GIRepository.Repository.prepend_search_path('@gmenu_path@'); 13 + +const {default: GMenu} = await import('gi://GMenu'); 14 + + 15 + import GObject from 'gi://GObject'; 16 + import Gtk from 'gi://Gtk'; 17 + import Meta from 'gi://Meta';