From a0f20138a4323764ead04e7ffda25dbc15dd81c6 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 2 Oct 2021 18:08:12 +0200
Subject: [PATCH] gnomeExtensions.unite: remove manually packaging and use
 extension overrides

---
 .../gnome/extensions/extensionOverrides.nix   | 14 ++++--
 .../gnome/extensions/manuallyPackaged.nix     |  1 -
 .../gnome/extensions/unite/default.nix        | 43 -------------------
 3 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/desktops/gnome/extensions/unite/default.nix

diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
index 182bdf6ecdfb..17fec38a6efd 100644
--- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix
+++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
@@ -1,7 +1,7 @@
-{
-  lib,
-  ddcutil,
-  gjs,
+{ lib
+, ddcutil
+, gjs
+, xprop
 }:
 # A set of overrides for automatically packaged extensions that require some small fixes.
 # The input must be an attribute set with the extensions' UUIDs as keys and the extension
@@ -29,4 +29,10 @@ super: super // {
     '';
   });
 
+  "unite@hardpixel.eu" = super."unite@hardpixel.eu".overrideAttrs (old: {
+    buildInputs = [ xprop ];
+
+    meta.maintainers = with lib.maintainers; [ rhoriguchi ];
+  });
+
 }
diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
index 3e99f3143d24..19d9861565fa 100644
--- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
+++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
@@ -21,6 +21,5 @@
   "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { };
   "tilingnome@rliang.github.com" = callPackage ./tilingnome { };
   "TopIcons@phocean.net" = callPackage ./topicons-plus { };
-  "unite@hardpixel.eu" = callPackage ./unite { };
   "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { };
 }
diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
deleted file mode 100644
index e73e43dd392e..000000000000
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-unite";
-  version = "55";
-
-  src = fetchFromGitHub {
-    owner = "hardpixel";
-    repo = "unite-shell";
-    rev = "v${version}";
-    sha256 = "0bav4vzky3p7np2gphxc6bw38c697kalmaibaar9vi0ip3xkkavk";
-  };
-
-  passthru = {
-    extensionUuid = "unite@hardpixel.eu";
-    extensionPortalSlug = "unite";
-  };
-
-  nativeBuildInputs = [ glib ];
-
-  buildInputs = [ xprop ];
-
-  buildPhase = ''
-    runHook preBuild
-    glib-compile-schemas --strict --targetdir="unite@hardpixel.eu/schemas/" "unite@hardpixel.eu/schemas"
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions
-    cp -r "unite@hardpixel.eu" $out/share/gnome-shell/extensions
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ rhoriguchi ];
-    homepage = "https://github.com/hardpixel/unite-shell";
-    broken = versionOlder gnome.gnome-shell.version "3.32";
-  };
-}