public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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]: 541b1711fe
This commit is contained in:
worldofpeace 2020-04-10 12:23:26 -04:00
parent cc1550c1ac
commit 3c4cf5db81
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
View File

@ -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;

8
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell"; pname = "switchboard-plug-pantheon-shell";
version = "2.8.2"; version = "2.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z"; sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8";
}; };
passthru = { passthru = {
@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
switchboard switchboard
]; ];
patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Switchboard Desktop Plug"; description = "Switchboard Desktop Plug";
homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;