alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gnomeExtensions.gsconnect: 23 -> 26

Browse source
This commit is contained in:
Tor Hedin Brønner 2019-09-10 05:10:51 +02:00
parent b748da63b8
commit 7d49165f78
2 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-gsconnect"; pname = "gnome-shell-gsconnect";
version = "23"; version = "26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andyholmes"; owner = "andyholmes";
repo = "gnome-shell-extension-gsconnect"; repo = "gnome-shell-extension-gsconnect";
rev = "v${version}"; rev = "v${version}";
sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid"; sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a";
}; };
patches = [ patches = [
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
upower upower
gnome3.caribou gnome3.caribou
gnome3.gjs # for running daemon gnome3.gjs # for running daemon
gnome3.evolution-data-server # folks.py requires org.gnome.Evolution.DefaultSources gsettings; TODO: hardcode the schema path to the library (similarly to https://github.com/NixOS/nixpkgs/issues/47226) gnome3.evolution-data-server # for libebook-contacts typelib
]; ];
mesonFlags = [ mesonFlags = [

40
pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
View file

@ -29,16 +29,32 @@
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib; const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
--- a/src/service/__init__.js --- a/src/preferences/service.js
+++ b/src/service/__init__.js +++ b/src/preferences/service.js
@@ -600,7 +600,9 @@ @@ -435,9 +435,9 @@ var Window = GObject.registerClass({
/**
* Convenience functions for saving/restoring window geometry _restoreGeometry() {
*/ if (this._mutterSettings === undefined) {
-const _mutter = new Gio.Settings({schema_id: 'org.gnome.mutter'}); - this._mutterSettings = new Gio.Settings({
+const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true); - schema_id: 'org.gnome.mutter'
+const _schema = _schema_source.lookup('org.gnome.mutter', false); - });
+const _mutter = new Gio.Settings({settings_schema: _schema}); + const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
+ const _schema = _schema_source.lookup('org.gnome.mutter', false);
+ this._mutterSettings = new Gio.Settings({settings_schema: _schema});
}
// Restore geometry, even if we're going to maximize
--- a/src/service/ui/messaging.js
+++ b/src/service/ui/messaging.js
@@ -891,9 +891,9 @@ var Window = GObject.registerClass({
*/
_restoreGeometry() {
if (this._mutterSettings === undefined) {
- this._mutterSettings = new Gio.Settings({
- schema_id: 'org.gnome.mutter'
- });
+ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
+ const _schema = _schema_source.lookup('org.gnome.mutter', false);
+ this._mutterSettings = new Gio.Settings({settings_schema: _schema});
}
Gtk.Window.prototype.restore_geometry = function() {
let [width, height] = this.settings.get_value('window-size').deep_unpack();