From e49db01d2069ef3ed78d557c6ad6bd426b86d806 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 17 Oct 2022 14:59:51 +0200
Subject: [PATCH] gnomeExtensions.pop-shell: unstable-2022-03-25 ->
 unstable-2022-10-11

Required for GNOME 43 compat.
---
 .../gnome/extensions/pop-shell/default.nix    |  6 +++---
 .../gnome/extensions/pop-shell/fix-gjs.patch  | 20 ++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
index d24a407f92b7..839a4d9949f2 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-2022-03-25";
+  version = "unstable-2022-10-11";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "shell";
-    rev = "a317816d02dd2cb20d31aeca81bf09eccc63e370";
-    hash = "sha256-uxoeCv25ew5+NkTpsKjQqDFrqw6ZA/+iYhyCHoCb6jM=";
+    rev = "886a069c0582b371e90ac3602b1747ea5fba616c";
+    hash = "sha256-DwJ3IFhYuEW0LQrmN/mOspEiudj4X5BCLhdOyP74EVs=";
   };
 
   nativeBuildInputs = [ glib nodePackages.typescript gjs ];
diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch
index 2f2a0bcfd094..83b4cea8b920 100644
--- a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch
+++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch
@@ -1,8 +1,8 @@
 diff --git a/src/extension.ts b/src/extension.ts
-index 7417c46..00d5829 100644
+index c3833e9..611e84c 100644
 --- a/src/extension.ts
 +++ b/src/extension.ts
-@@ -534,7 +534,7 @@ export class Ext extends Ecs.System<ExtEvent> {
+@@ -544,7 +544,7 @@ export class Ext extends Ecs.System<ExtEvent> {
              return true
          }
  
@@ -12,22 +12,18 @@ index 7417c46..00d5829 100644
          if (ipc) {
              const generator = (stdout: any, res: any) => {
 diff --git a/src/panel_settings.ts b/src/panel_settings.ts
-index 83ff56c..1bc1e98 100644
+index 5d02d33..1cd70d0 100644
 --- a/src/panel_settings.ts
 +++ b/src/panel_settings.ts
-@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) {
+@@ -348,7 +348,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 resp = GLib.spawn_command_line_async(path);
++        let resp = GLib.spawn_command_line_async(`${path}`);
          if (!resp) {
  
              return null;
-@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) {
-     });
- 
-     return color_selector_item;
--}
-\ No newline at end of file
-+}
+-- 
+2.37.3
+