Merge pull request #269668: gnomeExtensions.gsconnect: 55 -> 56

authored by piegames and committed by GitHub efe27d76 7cbcc1fd

+26 -18
+2 -2
pkgs/desktops/gnome/extensions/gsconnect/default.nix
··· 23 23 24 24 stdenv.mkDerivation rec { 25 25 pname = "gnome-shell-extension-gsconnect"; 26 - version = "55"; 26 + version = "56"; 27 27 28 28 outputs = [ "out" "installedTests" ]; 29 29 ··· 31 31 owner = "GSConnect"; 32 32 repo = "gnome-shell-extension-gsconnect"; 33 33 rev = "v${version}"; 34 - hash = "sha256-n6NbNgl+2FOhly/BeR7I6BvPOYe7leAdeAegaqhcGJU="; 34 + hash = "sha256-V2L65Fz1WcJE2ENE8uNgIuVSXLDHokcgM4Caz1sOdZM="; 35 35 }; 36 36 37 37 patches = [
+24 -16
pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch
··· 11 11 Terminal=false 12 12 NoDisplay=true 13 13 Icon=org.gnome.Shell.Extensions.GSConnect 14 + diff --git a/src/__nix-prepend-search-paths.js b/src/__nix-prepend-search-paths.js 15 + new file mode 100644 16 + index 00000000..d009dfd9 17 + --- /dev/null 18 + +++ b/src/__nix-prepend-search-paths.js 19 + @@ -0,0 +1,2 @@ 20 + +import GIRepository from 'gi://GIRepository'; 21 + +'@typelibPath@'.split(':').forEach(path => GIRepository.Repository.prepend_search_path(path)); 14 22 diff --git a/src/extension.js b/src/extension.js 15 - index 3fae443a..7aa19842 100644 23 + index 53ecd5fc..78782357 100644 16 24 --- a/src/extension.js 17 25 +++ b/src/extension.js 18 - @@ -4,6 +4,8 @@ 19 - 20 - 'use strict'; 26 + @@ -2,6 +2,8 @@ 27 + // 28 + // SPDX-License-Identifier: GPL-2.0-or-later 21 29 22 - +'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); 30 + +import './__nix-prepend-search-paths.js'; 23 31 + 24 - const Gio = imports.gi.Gio; 25 - const GObject = imports.gi.GObject; 26 - const Gtk = imports.gi.Gtk; 32 + import Gio from 'gi://Gio'; 33 + import GObject from 'gi://GObject'; 34 + 27 35 diff --git a/src/prefs.js b/src/prefs.js 28 - index b8860c82..d6292606 100644 36 + index dd20fd20..5f82c53a 100644 29 37 --- a/src/prefs.js 30 38 +++ b/src/prefs.js 31 - @@ -4,6 +4,8 @@ 32 - 33 - 'use strict'; 39 + @@ -2,6 +2,8 @@ 40 + // 41 + // SPDX-License-Identifier: GPL-2.0-or-later 34 42 35 - +'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); 43 + +import './__nix-prepend-search-paths.js'; 36 44 + 37 - const {Gio, GLib, Adw} = imports.gi; 38 - 39 - // Bootstrap 45 + import Gio from 'gi://Gio'; 46 + import GLib from 'gi://GLib'; 47 + import Adw from 'gi://Adw';