From 7af34f07377e0c18bc4b539f2087216154505f61 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sun, 19 Sep 2021 11:58:01 +0200
Subject: [PATCH] chore: update pop-shell

---
 desktop/gnome.nix          | 24 +-----------------------
 flake.nix                  |  4 ++++
 pkgs/pop-shell/default.nix | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/pop-shell/default.nix

diff --git a/desktop/gnome.nix b/desktop/gnome.nix
index 8eac0a1..4dd2856 100644
--- a/desktop/gnome.nix
+++ b/desktop/gnome.nix
@@ -1,28 +1,6 @@
 { config, pkgs, ... }:
 
-with pkgs;
-let
-  pop-shell = stdenv.mkDerivation rec {
-    pname = "pop-shell";
-    version = "2021-05-07";
-
-    src = fetchFromGitHub {
-      owner = "pop-os";
-      repo = "shell";
-      rev = "9507dc38f75f56e657cf071d5f8dc578c5dc9352";
-      sha256 = "161946y5nk1nlxafhkxyshqn4va10rk911bdbcwxjnak1w7557gm";
-    };
-
-    nativeBuildInputs = [ glib nodePackages.typescript ];
-
-    # the gschema doesn't seem to be installed properly (see dconf)
-    makeFlags = [
-      "INSTALLBASE=$(out)/share/gnome-shell/extensions"
-      "PLUGIN_BASE=$(out)/share/pop-shell/launcher"
-      "SCRIPTS_BASE=$(out)/share/pop-shell/scripts"
-    ];
-  };
-in {
+{
   environment.systemPackages = with pkgs;
     with gnomeExtensions; [
       gnome.dconf-editor
diff --git a/flake.nix b/flake.nix
index e1b787f..d5eac0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,6 +70,9 @@
         deconz = self: super: {
           deconz = self.qt5.callPackage ./pkgs/deconz { };
         };
+        pop-shell = self: super: {
+          pop-shell = self.callPackage ./pkgs/pop-shell { };
+        };
         obelisk = self: super: {
           obelisk = (import obelisk { inherit (self) system; }).command;
         };
@@ -86,6 +89,7 @@
           nur.overlay
           overlays.neovim
           overlays.deconz
+          overlays.pop-shell
           overlays.photoprism
           overlays.obelisk
         ];
diff --git a/pkgs/pop-shell/default.nix b/pkgs/pop-shell/default.nix
new file mode 100644
index 0000000..206d1c5
--- /dev/null
+++ b/pkgs/pop-shell/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, stdenv, glib, nodePackages, gjs }:
+
+stdenv.mkDerivation rec {
+  pname = "pop-shell";
+  version = "2021-09-10";
+
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "shell";
+    rev = "59ca9cede3c185c347bd2ae3d40882e020fb1fd0";
+    sha256 = "llwchrg/a8QmmD9eOt7IUZY2crYubFSDyvrTVwSz0pE=";
+  };
+
+  nativeBuildInputs = [ glib nodePackages.typescript gjs ];
+
+  buildInputs = [ gjs ];
+
+  # the gschema doesn't seem to be installed properly (see dconf)
+  makeFlags = [
+    "INSTALLBASE=$(out)/share/gnome-shell/extensions"
+    "PLUGIN_BASE=$(out)/share/pop-shell/launcher"
+    "SCRIPTS_BASE=$(out)/share/pop-shell/scripts"
+  ];
+}