summary refs log tree commit diff
path: root/pkgs/desktops/pantheon
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-11-10 20:47:04 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2019-11-10 20:59:56 -0500
commit58f9fcdf4b94b13ee51af105106ca2a4b38454c3 (patch)
treef29e73bdf694d01c88475f8d6cf57ba3b5a4f02d /pkgs/desktops/pantheon
parent848399f448201d0d2f2096e07c09d86899ccc235 (diff)
downloadnixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.tar
nixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.tar.gz
nixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.tar.bz2
nixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.tar.lz
nixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.tar.xz
nixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.tar.zst
nixpkgs-58f9fcdf4b94b13ee51af105106ca2a4b38454c3.zip
pantheon.switchboard: 2.3.6 -> 2.3.7
Drops libunity https://github.com/elementary/switchboard/pull/109.

https://github.com/elementary/switchboard/releases/tag/2.3.7
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard/default.nix6
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch10
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 5c10cc0e9e4..30f870671ee 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -11,20 +11,19 @@
 , granite
 , gettext
 , clutter-gtk
-, libunity
 , elementary-icon-theme
 , wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard";
-  version = "2.3.6";
+  version = "2.3.7";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "0lsrn636b0f9a58jbid6mlhgrf8ajnh7phwmhgxz55sz7k7qa58g";
+    sha256 = "160aar5dqd019vn28cm0d0ijj1i6mwpqkl7a1l4lpasw12drxwxz";
   };
 
   passthru = {
@@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
     granite
     gtk3
     libgee
-    libunity
   ];
 
   patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch b/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
index f5d8567bffe..d5931d59ec9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
@@ -1,13 +1,9 @@
 diff --git a/lib/PlugsManager.vala b/lib/PlugsManager.vala
-index 75d0eaf..c227908 100644
+index 8b21e7b..bc36321 100644
 --- a/lib/PlugsManager.vala
 +++ b/lib/PlugsManager.vala
-@@ -34,10 +34,18 @@ public class Switchboard.PlugsManager : GLib.Object {
-     private Gee.LinkedList<Switchboard.Plug> plugs;
-     
-     public signal void plug_added (Switchboard.Plug plug);
--    
-+
+@@ -36,7 +36,15 @@ public class Switchboard.PlugsManager : GLib.Object {
+ 
      private PlugsManager () {
          plugs = new Gee.LinkedList<Switchboard.Plug> ();
 -        var base_folder = File.new_for_path (Build.PLUGS_DIR);