gnomeExtensions: GIRepository fixes (#461784)
This commit is contained in:
@@ -15,7 +15,7 @@ index 6eb58f1..28e1195 100644
|
||||
import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
|
||||
import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
|
||||
|
||||
+GIRepository.Repository.prepend_search_path('@gmenu_path@');
|
||||
+GIRepository.Repository.dup_default().prepend_search_path('@gmenu_path@');
|
||||
+const {default: GMenu} = await import('gi://GMenu');
|
||||
const appSys = Shell.AppSystem.get_default();
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ index 37d2eb1..232d0d5 100644
|
||||
|
||||
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
||||
|
||||
+GIRepository.Repository.prepend_search_path('@gtop_path@');
|
||||
+GIRepository.Repository.dup_default().prepend_search_path('@gtop_path@');
|
||||
+const GTop = (await import("gi://GTop")).default;
|
||||
+
|
||||
const THRESHOLD_HIGH = 0.80;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
// Author: Stéphane Démurget <stephane.demurget@free.fr>
|
||||
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0')
|
||||
+imports.gi.GIRepository.Repository.dup_default().prepend_search_path('@vte@/lib/girepository-1.0')
|
||||
+
|
||||
const Lang = imports.lang;
|
||||
const Gettext = imports.gettext.domain("drop-down-terminal");
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
// Author: Stéphane Démurget <stephane.demurget@free.fr>
|
||||
+
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0')
|
||||
+imports.gi.GIRepository.Repository.dup_default().prepend_search_path('@vte@/lib/girepository-1.0')
|
||||
+
|
||||
const Lang = imports.lang;
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ index c608441..2b25335 100644
|
||||
-import GMenu from 'gi://GMenu';
|
||||
+
|
||||
+import GIRepository from 'gi://GIRepository';
|
||||
+GIRepository.Repository.prepend_search_path('@gmenu_path@');
|
||||
+GIRepository.Repository.dup_default().prepend_search_path('@gmenu_path@');
|
||||
+const {default: GMenu} = await import('gi://GMenu');
|
||||
+
|
||||
import GObject from 'gi://GObject';
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ index ee8c3a9..ca72885 100644
|
||||
|
||||
import * as Util from "resource:///org/gnome/shell/misc/util.js";
|
||||
|
||||
+GIRepository.Repository.prepend_search_path('@gtop_path@');
|
||||
+GIRepository.Repository.dup_default().prepend_search_path('@gtop_path@');
|
||||
+const GTop = (await import("gi://GTop")).default;
|
||||
+
|
||||
const NetworkManager = NM;
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ index 39d175a..9815b77 100644
|
||||
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
|
||||
import NM from 'gi://NM';
|
||||
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
|
||||
+imports.gi.GIRepository.Repository.dup_default().prepend_search_path('@gtop_path@');
|
||||
+
|
||||
let GTop, hasGTop = true;
|
||||
try {
|
||||
|
||||
@@ -68,14 +68,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgnome_shell_libdir=${gnome-shell}/lib"
|
||||
"-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
|
||||
"-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
|
||||
"-Dopenssl_path=${openssl}/bin/openssl"
|
||||
"-Dsshadd_path=${openssh}/bin/ssh-add"
|
||||
"-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
|
||||
"-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
(lib.mesonOption "gnome_shell_libdir" "${gnome-shell}/lib")
|
||||
(lib.mesonOption "chrome_nmhdir" "${placeholder "out"}/etc/opt/chrome/native-messaging-hosts")
|
||||
(lib.mesonOption "chromium_nmhdir" "${placeholder "out"}/etc/chromium/native-messaging-hosts")
|
||||
(lib.mesonOption "openssl_path" "${openssl}/bin/openssl")
|
||||
(lib.mesonOption "sshadd_path" "${openssh}/bin/ssh-add")
|
||||
(lib.mesonOption "sshkeygen_path" "${openssh}/bin/ssh-keygen")
|
||||
(lib.mesonOption "session_bus_services_dir" "${placeholder "out"}/share/dbus-1/services")
|
||||
(lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,7 +18,7 @@ index 00000000..d009dfd9
|
||||
+++ b/src/__nix-prepend-search-paths.js
|
||||
@@ -0,0 +1,2 @@
|
||||
+import GIRepository from 'gi://GIRepository';
|
||||
+'@typelibPath@'.split(':').forEach(path => GIRepository.Repository.prepend_search_path(path));
|
||||
+'@typelibPath@'.split(':').forEach(path => GIRepository.Repository.dup_default().prepend_search_path(path));
|
||||
diff --git a/src/extension.js b/src/extension.js
|
||||
index 53ecd5fc..78782357 100644
|
||||
--- a/src/extension.js
|
||||
|
||||
Reference in New Issue
Block a user