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

Merge pull request #84916 from worldofpeace/pantheon-update-04-10

Browse Source 
Pantheon update 2020-04-10
This commit is contained in:
worldofpeace
2020-04-10 14:17:48 -04:00
committed by GitHub
parent 168a045e25 dd805599a9
commit 0e27a1f2b4
15 changed files with 30 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71";
sha256 = "1cjhip0abc0y5w6cqnjcgi48bfrackp45gz7955l66hxhnm5wyw6";
};
passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-applications";
version = "2.1.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg";
sha256 = "0wzm390g8di4ks3w637a0wl4j7g89j321xkz5msd9058gksvaaxs";
};
passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh";
sha256 = "1racp0mxiaix9afx25ryskdcyi335fz8yh8nwgdxbqbm6jpyq4zs";
};
passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7";
sha256 = "19y1n05pc3j0px5pql5338vzrq6hjw209s8l2l70ha4i4r978qir";
};
passthru = {
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
-26
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;
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+2 -6
View File
@@ -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";
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1dwq9rqswgnnglhrgcpvrp6shn3pb4x8f8f23x84sqakb430idp7";
sha256 = "1rgbw2kfcq7cdpvl6sy6r6d4iprm1j2n3knbnbxy8sylfc83bwri";
};
passthru = {