about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRyan Horiguchi <ryan.horiguchi@gmail.com>2021-05-19 12:08:14 +0200
committerRyan Horiguchi <ryan.horiguchi@gmail.com>2021-05-19 17:12:53 +0200
commit3b34293b284357cacf4fb35cf56166d3b13a93cf (patch)
treee361ad6c993b5476408886214d3128229bb0c8ea
parent1dbb8fa2be2ed390c08c6cca79bba7d414de2701 (diff)
gnomeExtensions.fuzzy-app-search: 4 -> 4.0.1
-rwxr-xr-xpkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix8
-rwxr-xr-xpkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch50
2 files changed, 3 insertions, 55 deletions
diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
index 302b21f2aefc5..9ba9ddaf09b1b 100755
--- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
+++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
@@ -2,21 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-fuzzy-app-search";
-  version = "4";
+  version = "4.0.1";
 
   src = fetchFromGitLab {
     owner = "Czarlie";
     repo = "gnome-fuzzy-app-search";
-    rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5";
-    sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn";
+    rev = "v${version}";
+    sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a";
   };
 
   uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com";
 
   nativeBuildInputs = [ glib ];
 
-  patches = [ ./fix-desktop-file-paths.patch ];
-
   makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch
deleted file mode 100755
index 1795f998c9bde..0000000000000
--- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/applicationsUtils.js b/applicationsUtils.js
-index 728223b..aa9f291 100644
---- a/applicationsUtils.js
-+++ b/applicationsUtils.js
-@@ -44,27 +44,24 @@ var Search = new Lang.Class({
-      * @return {Void}
-      */
-     _init: function () {
--        let dir = [
--            "/usr/share/applications",
--            GLib.get_home_dir() + "/.local/share/applications",
--        ];
--
--        // listen object - file/monitor list
--        this._listen = dir.map((path) => {
--            let file = Gio.File.new_for_path(path);
--            let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
--
--            // refresh on each directory change
--            monitor.connect(
--                "changed",
--                Lang.bind(this, this._handleMonitorChanged)
--            );
--
--            return {
--                file: file,
--                monitor: monitor,
--            };
--        });
-+        this._listen = [...new Set(GLib.get_system_data_dirs())]
-+            .filter((path) => path.endsWith("/share"))
-+            .map((path) => Gio.File.new_for_path(path + "/applications"))
-+            .filter((file) => file.query_exists(null))
-+            .map((file) => {
-+                let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
-+
-+                // refresh on each directory change
-+                monitor.connect(
-+                    "changed",
-+                    Lang.bind(this, this._handleMonitorChanged)
-+                );
-+
-+                return {
-+                    file: file,
-+                    monitor: monitor,
-+                };
-+            });
-         this._interval = null;
-         this._data = {};
- 
\ No newline at end of file