diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-19 14:38:02 -0500 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-22 05:13:15 -0500 |
commit | c44d5bd9fd08703ac0511ceb5f6ade13b2413729 (patch) | |
tree | c7b75f326fb93408be10c7800ea3c2a7714ec51c /pkgs/desktops/pantheon | |
parent | daccdcfb779efd7508dbe3c4f77831c56b42fa25 (diff) | |
download | nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.tar nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.tar.gz nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.tar.bz2 nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.tar.lz nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.tar.xz nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.tar.zst nixpkgs-c44d5bd9fd08703ac0511ceb5f6ade13b2413729.zip |
pantheon.switchboard-plug-pantheon-shell: 2.8.1 -> 2.8.2
Don't need pkgconfig override because of * https://github.com/elementary/switchboard-plug-pantheon-shell/commit/d9971ebf1f0480a8501c547b7d2945f4ea93cef5 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
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch | 20 |
2 files changed, 22 insertions, 12 deletions
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 35dd958483d..cd48b9d1d78 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.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw"; + sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z"; }; passthru = { @@ -43,23 +43,17 @@ stdenv.mkDerivation rec { patches = [ ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded ./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 = '' substituteInPlace src/Views/Appearance.vala \ --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 \ --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel} ''; - - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch index d023e1b55ce..d337cf2e7b7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch @@ -1,5 +1,5 @@ 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 +++ b/src/Views/Appearance.vala @@ -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); + 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); 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 (); + |