diff options
| author | 4JX <79868816+4JX@users.noreply.github.com> | 2023-11-26 13:55:43 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-11-29 11:35:20 +0000 |
| commit | bc77c1ca24bc54db9a2b39641d66fc97ae80c2e7 (patch) | |
| tree | c953f73f2319a96f4c56d7bba84d2865f3874af1 | |
| parent | Merge pull request #270902 from NixOS/backport-270856-to-release-23.11 (diff) | |
| download | nixpkgs-origin/backport-270142-to-release-23.11.tar.gz | |
gnomeExtensions.arcmenu: 44 -> 52origin/backport-270142-to-release-23.11
(cherry picked from commit b59ed689c4bd5bc8394734def7edff7ef602ed7d)
| -rw-r--r-- | pkgs/desktops/gnome/extensions/arcmenu/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch | 39 |
2 files changed, 33 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 8a0c7c29deb6..a4e1fea6931c 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "44"; + version = "52"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; - rev = "v44.1"; - sha256 = "sha256-+aPBRxjL5lgdm96SbRZnp+9o9nl2N8Rb3dehMAv883c="; + rev = "v${version}"; + sha256 = "sha256-nZRdNkS4JfSwtqQsROKa1+eqcgwMQwVsqgeWVPpZIi0="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch index 3fd46e080649..a61eda35636c 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch +++ b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch @@ -1,10 +1,31 @@ ---- a/extension.js -+++ b/extension.js -@@ -20,6 +20,8 @@ - const ExtensionUtils = imports.misc.extensionUtils; - const Me = ExtensionUtils.getCurrentExtension(); - -+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); +--- a/menuWidgets.js ++++ b/menuWidgets.js +@@ -3,7 +3,11 @@ + import Atk from 'gi://Atk'; + import Clutter from 'gi://Clutter'; + import Gio from 'gi://Gio'; + import GLib from 'gi://GLib'; +-import GMenu from 'gi://GMenu'; + - const Constants = Me.imports.constants; - const Controller = Me.imports.controller; ++import GIRepository from 'gi://GIRepository'; ++GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++const {default: GMenu} = await import('gi://GMenu'); ++ + import GObject from 'gi://GObject'; + import Graphene from 'gi://Graphene'; + import Pango from 'gi://Pango'; +--- a/menulayouts/baseMenuLayout.js ++++ b/menulayouts/baseMenuLayout.js +@@ -1,7 +1,11 @@ + import Clutter from 'gi://Clutter'; + import Gio from 'gi://Gio'; + import GLib from 'gi://GLib'; +-import GMenu from 'gi://GMenu'; ++ ++import GIRepository from 'gi://GIRepository'; ++GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++const {default: GMenu} = await import('gi://GMenu'); ++ + import GObject from 'gi://GObject'; + import Shell from 'gi://Shell'; + import St from 'gi://St'; |