diff options
| author | Dawid Dziurla <dawidd0811@gmail.com> | 2023-11-25 14:45:16 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-11-26 08:43:37 +0000 |
| commit | 9956441a4ed53c7cb0f9f4c27d443753961c2555 (patch) | |
| tree | 392b72f77b251d021073049c244a9317da5199a9 | |
| parent | d572fb05455ec85f5cf2fa069784be09f97de941 (diff) | |
gnomeExtensions.pop-shell: unstable-2023-04-27 -> unstable-2023-11-10
(cherry picked from commit da87e679f59942b6b2b49ef3de7cb30f59af66bb)
| -rw-r--r-- | pkgs/desktops/gnome/extensions/pop-shell/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch | 25 |
2 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index e40689348625f..2c383b45f48de 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-pop-shell"; - version = "unstable-2023-04-27"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "pop-os"; repo = "shell"; - rev = "b5acccefcaa653791d25f70a22c0e04f1858d96e"; - hash = "sha256-w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c="; + rev = "aafc9458a47a68c396933c637de00421f5198a2a"; + hash = "sha256-74lZbEYHj7fufRSbuI2SN9rqbB3gpRa0V96qjAFc01s="; }; nativeBuildInputs = [ glib gjs typescript ]; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index 83b4cea8b9200..4d072f88708af 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -1,29 +1,26 @@ diff --git a/src/extension.ts b/src/extension.ts -index c3833e9..611e84c 100644 +index f34e865..f12d4db 100644 --- a/src/extension.ts +++ b/src/extension.ts -@@ -544,7 +544,7 @@ export class Ext extends Ecs.System<ExtEvent> { - return true - } +@@ -556,7 +556,7 @@ export class Ext extends Ecs.System<ExtEvent> { + return true; + }; -- const ipc = utils.async_process_ipc(["gjs", path]) -+ const ipc = utils.async_process_ipc([path]) +- const ipc = utils.async_process_ipc(['gjs', '--module', path]); ++ const ipc = utils.async_process_ipc([path]); if (ipc) { const generator = (stdout: any, res: any) => { diff --git a/src/panel_settings.ts b/src/panel_settings.ts -index 5d02d33..1cd70d0 100644 +index fbcafbf..ef409ee 100644 --- a/src/panel_settings.ts +++ b/src/panel_settings.ts -@@ -348,7 +348,7 @@ function color_selector(ext: Ext, menu: any) { +@@ -352,7 +352,7 @@ function color_selector(ext: Ext, menu: any) { color_selector_item.add_child(color_button); color_button.connect('button-press-event', () => { - let path = Me.dir.get_path() + "/color_dialog/main.js"; -- let resp = GLib.spawn_command_line_async(`gjs ${path}`); + let path = get_current_path() + '/color_dialog/main.js'; +- let resp = GLib.spawn_command_line_async(`gjs --module ${path}`); + let resp = GLib.spawn_command_line_async(`${path}`); if (!resp) { - return null; --- -2.37.3 - + } |