Unverified Commit e47ede3e authored by Honnip's avatar Honnip
Browse files

gnomeExtensions.tophat: fix build 

As of version 16, libgtop and clutter is not required.
parent d729de86

pkgs/desktops/gnome/extensions/extensionOverrides.nix

+0 −9
Original line number Diff line number Diff line
@@ -146,15 +146,6 @@ super: lib.trivial.pipe super [ 
    meta.maintainers = with lib.maintainers; [ andersk ];

  }))



  (patchExtension "tophat@fflewddur.github.io" (old: {

    patches = [

      (substituteAll {

        src = ./extensionOverridesPatches/tophat_at_fflewddur.github.io.patch;

        gtop_path = "${libgtop}/lib/girepository-1.0";

      })

    ];

  }))



  (patchExtension "Vitals@CoreCoding.com" (old: {

    patches = [

      (substituteAll {

pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
diff --git a/lib/cpu.js b/lib/cpu.js

--- a/lib/cpu.js

+++ b/lib/cpu.js

@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';

 import Gio from 'gi://Gio';

 import GLib from 'gi://GLib';

 import GObject from 'gi://GObject';

-import GTop from 'gi://GTop';

+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');

+const {default: GTop} = await import('gi://GTop');

 import St from 'gi://St';

 

 import {gettext as _, ngettext} from 'resource:///org/gnome/shell/extensions/extension.js';

diff --git a/lib/fs.js b/lib/fs.js

--- a/lib/fs.js

+++ b/lib/fs.js

@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';

 import Gio from 'gi://Gio';

 import GLib from 'gi://GLib';

 import GObject from 'gi://GObject';

-import GTop from 'gi://GTop';

+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');

+const {default: GTop} = await import('gi://GTop');

 import St from 'gi://St';

 

 import * as Config from './config.js';

diff --git a/lib/mem.js b/lib/mem.js

--- a/lib/mem.js

+++ b/lib/mem.js

@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';

 import Gio from 'gi://Gio';

 import GLib from 'gi://GLib';

 import GObject from 'gi://GObject';

-import GTop from 'gi://GTop';

+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');

+const {default: GTop} = await import('gi://GTop');

 import St from 'gi://St';

 

 import {gettext as _, ngettext} from 'resource:///org/gnome/shell/extensions/extension.js';

diff --git a/lib/net.js b/lib/net.js

--- a/lib/net.js

+++ b/lib/net.js

@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';

 import Gio from 'gi://Gio';

 import GLib from 'gi://GLib';

 import GObject from 'gi://GObject';

-import GTop from 'gi://GTop';

+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');

+const {default: GTop} = await import('gi://GTop');

 import St from 'gi://St';

 

 import {gettext as _, ngettext} from 'resource:///org/gnome/shell/extensions/extension.js';

diff --git a/lib/shared.js b/lib/shared.js

--- a/lib/shared.js

+++ b/lib/shared.js

@@ -18,7 +18,8 @@

 // along with TopHat. If not, see <https://www.gnu.org/licenses/>.

 

 import Gio from 'gi://Gio';

-import GTop from 'gi://GTop';

+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');

+const {default: GTop} = await import('gi://GTop');

 import Clutter from 'gi://Clutter';

 

 export const SECOND_AS_MICROSECONDS = 1000000;