Babbaj 2022-10-18 10:15:10 -04:00
parent d9ef9f3645
commit 41bd9d6706
No known key found for this signature in database
GPG key ID: F044309848A07CAC
2 changed files with 22 additions and 26 deletions
pkgs/desktops/gnome/extensions/gsconnect

View file

@ -18,11 +18,12 @@
, evolution-data-server-gtk4
, gjs
, nixosTests
, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-gsconnect";
version = "50";
version = "54";
outputs = [ "out" "installedTests" ];
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "GSConnect";
repo = "gnome-shell-extension-gsconnect";
rev = "v${version}";
hash = "sha256-uUpdjBsVeS99AYDpGlXP9fMqGxWj+XfVubNoGJs76G0=";
hash = "sha256-Dt5T5luuKpSkoOs6MjOBg/yMm52hRfymKBeRklPWy+M=";
};
patches = [
@ -42,12 +43,6 @@ stdenv.mkDerivation rec {
# Allow installing installed tests to a separate output
./installed-tests-path.patch
# Update extension for Nautilus 43.
(fetchpatch {
url = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/commit/9723ea9102f07c2c60fa065184cc58c2bc260abf.patch";
sha256 = "9afy/70AwW+OYML5J5IyBBiNKWkZ+wZZryZbi4uRfs4=";
})
];
nativeBuildInputs = [
@ -56,6 +51,7 @@ stdenv.mkDerivation rec {
pkg-config
gobject-introspection # for locating typelibs
wrapGAppsHook # for wrapping daemons
desktop-file-utils # update-desktop-database
];
buildInputs = [
@ -69,20 +65,16 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgnome_shell_libdir=${gnome.gnome-shell}/lib"
"-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}"
"-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"
"-Dpost_install=true"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
postPatch = ''
patchShebangs meson/nmh.sh
patchShebangs meson/post-install.sh
patchShebangs installed-tests/prepare-tests.sh
# TODO: do not include every typelib everywhere
@ -91,6 +83,10 @@ stdenv.mkDerivation rec {
substituteInPlace "$file" \
--subst-var-by typelibPath "$GI_TYPELIB_PATH"
done
# slightly janky fix for gsettings_schemadir being removed
substituteInPlace data/config.js.in \
--subst-var-by GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
'';
postFixup = ''

View file

@ -1,7 +1,7 @@
diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
diff --git a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
index ffb23342..b405c73b 100644
--- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
+++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
--- a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
@ -11,10 +11,10 @@ index ffb23342..b405c73b 100644
Terminal=false
NoDisplay=true
Icon=org.gnome.Shell.Extensions.GSConnect
diff --git i/src/extension.js w/src/extension.js
index 5f32aa68..872c0c61 100644
--- i/src/extension.js
+++ w/src/extension.js
diff --git a/src/extension.js b/src/extension.js
index e7fd971a..8474bb3b 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -1,5 +1,7 @@
'use strict';
@ -23,15 +23,15 @@ index 5f32aa68..872c0c61 100644
const Gio = imports.gi.Gio;
const GObject = imports.gi.GObject;
const Gtk = imports.gi.Gtk;
diff --git i/src/prefs.js w/src/prefs.js
index 07e93099..1c166710 100644
--- i/src/prefs.js
+++ w/src/prefs.js
diff --git a/src/prefs.js b/src/prefs.js
index 922ea60c..2cd62eb5 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -1,5 +1,7 @@
'use strict';
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
+
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk;
const {Gio, GLib, Adw} = imports.gi;
// Bootstrap