From 3c4cf5db81dd0413874f286da397fe0a705314b3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 10 Apr 2020 12:23:26 -0400
Subject: [PATCH] pantheon.switchboard-plug-pantheon-shell: 2.8.2 -> 2.8.3

Don't need backgrounds patch anymore because of my patch upstream [0]

https://github.com/elementary/switchboard-plug-pantheon-shell/releases/tag/2.8.3

[0]: https://github.com/elementary/switchboard-plug-pantheon-shell/commit/541b1711feb7c7c44a8985eb9fd3ec05ac60bafd
---
 .../pantheon-shell/backgrounds.patch          | 26 -------------------
 .../pantheon-shell/default.nix                |  8 ++----
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
deleted file mode 100644
index a1b019179d1..00000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/set-wallpaper-contract/set-wallpaper.vala b/set-wallpaper-contract/set-wallpaper.vala
-index 3e02089..7ce7041 100644
---- a/set-wallpaper-contract/set-wallpaper.vala
-+++ b/set-wallpaper-contract/set-wallpaper.vala
-@@ -38,7 +38,7 @@ namespace SetWallpaperContractor {
-         </transition>
-     """;
- 
--    const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds";
-+    const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds";
- 
-     private int delay_value = 60;
- 
-diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
-index 4be14fa..aa8832f 100644
---- a/src/Views/Wallpaper.vala
-+++ b/src/Views/Wallpaper.vala
-@@ -38,7 +38,7 @@ public class Wallpaper : Gtk.Grid {
-         FileAttribute.THUMBNAIL_IS_VALID
-     };
- 
--    const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds";
-+    const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds";
- 
-     public Switchboard.Plug plug { get; construct set; }
-     private GLib.Settings settings;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index ab9ecbc5a33..d806271d789 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-pantheon-shell";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z";
+    sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8";
   };
 
   passthru = {
@@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  patches = [
-    ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
-  ];
-
   meta = with stdenv.lib; {
     description = "Switchboard Desktop Plug";
     homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;