NixOS · Oct 18, 2019 · Oct 18, 2019
Showing with 17 additions and 33 deletions.

+2 −3 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix

+0 −29 pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch

+15 −1 pkgs/development/haskell-modules/configuration-common.nix
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -4,21 +4,20 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-gsconnect";
-  version = "26";
+  version = "27";
 
   src = fetchFromGitHub {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a";
+    sha256 = "0bpg7hl81wir3c15ri8kbvr6xhalpkfmcyazwmmwyj5lxpn40ykk";
   };
 
   patches = [
     # Make typelibs available in the extension
     (substituteAll {
       src = ./fix-paths.patch;
       gapplication = "${glib.bin}/bin/gapplication";
-      mutter_gsettings_path = glib.getSchemaPath gnome3.mutter;
     })
   ];
 

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
@@ -29,32 +29,3 @@
  const Gio = imports.gi.Gio;
  const GLib = imports.gi.GLib;
  const Gtk = imports.gi.Gtk;
---- a/src/preferences/service.js
-+++ b/src/preferences/service.js
-@@ -435,9 +435,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});
-         }
-
-         // 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});
-         }
-
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -589,9 +589,23 @@ self: super: {
   sets = dontCheck super.sets;
 
   # Install icons, metadata and cli program.
-  bustle = overrideCabal super.bustle (drv: {
+  # Do not build hgettext as it is broken
+  # https://gitlab.freedesktop.org/bustle/bustle/issues/13
+  bustle = overrideCabal (disableCabalFlag (super.bustle.override { hgettext = null; }) "hgettext") (drv: {
     buildDepends = [ pkgs.libpcap ];
     buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
+    patches = [
+      # fix build
+      # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14
+      (pkgs.fetchpatch {
+        url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch";
+        sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa";
+      })
+      (pkgs.fetchpatch {
+        url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch";
+        sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a";
+      })
+    ];
     postInstall = ''
       make install PREFIX=$out
     '';