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

pantheon.switchboard-plug-pantheon-shell: 2.8.1 -> 2.8.2

Browse Source 
Don't need pkgconfig override because of
* d9971ebf1f

Patch to fix background permission issues is included in this release
so the downstream patch is dropped.

https://github.com/elementary/switchboard-plug-pantheon-shell/releases/tag/2.8.2
This commit is contained in:
worldofpeace 2019-11-19 14:38:02 -05:00
parent daccdcfb77
commit c44d5bd9fd
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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.1"; version = "2.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw"; sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z";
}; };
passthru = { passthru = {
@ -43,23 +43,17 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
./hardcode-gsettings.patch ./hardcode-gsettings.patch
# Fixes https://github.com/elementary/switchboard-plug-pantheon-shell/issues/172
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/e4f86df6a6be402db4c979a4b005573618b744d1.patch";
sha256 = "0sa8611k6sqg96mnp2plmxd30w6zq76bfwszl8ankr9kwsgyc66y";
})
]; ];
postPatch = '' postPatch = ''
substituteInPlace src/Views/Appearance.vala \ substituteInPlace src/Views/Appearance.vala \
--subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala} --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/HotCorners.vala \
--subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/Appearance.vala \ substituteInPlace src/Views/Appearance.vala \
--subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel} --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
''; '';
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
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;

20
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala
index 721d458..17e1c58 100644 index c8300cc..fc48a0e 100644
--- a/src/Views/Appearance.vala --- a/src/Views/Appearance.vala
+++ b/src/Views/Appearance.vala +++ b/src/Views/Appearance.vala
@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid { @@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid {
@ -17,7 +17,23 @@ index 721d458..17e1c58 100644
+ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); + SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false); + SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false);
+ +
+ var panel_settings = new Settings.full (panel_schema, null, null); + var panel_settings = new GLib.Settings.full (panel_schema, null, null);
panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT); panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT);
var interface_settings = new Settings (INTERFACE_SCHEMA); var interface_settings = new Settings (INTERFACE_SCHEMA);
diff --git a/src/Views/HotCorners.vala b/src/Views/HotCorners.vala
index 481e7c5..d102d03 100644
--- a/src/Views/HotCorners.vala
+++ b/src/Views/HotCorners.vala
@@ -30,7 +30,10 @@ public class HotCorners : Gtk.Grid {
row_spacing = 24;
halign = Gtk.Align.CENTER;
- behavior_settings = new GLib.Settings ("org.pantheon.desktop.gala.behavior");
+
+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema behavior_schema = gala_schema_source.lookup ("org.pantheon.desktop.gala.behavior", false);
+ behavior_settings = new GLib.Settings.full (behavior_schema, null, null);
custom_command_revealer = new Gtk.Revealer ();