diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-03 17:11:21 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-05 20:39:10 -0400 |
commit | 441d85c4c50214128fc4a4dfa138edf250414e03 (patch) | |
tree | 279f4a5d26330e188951756e47664513d99253d0 /pkgs/desktops/pantheon/apps/switchboard-plugs | |
parent | fac751f8159d8e4714303a99e257e2d5f6497ebb (diff) | |
download | nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.tar nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.tar.gz nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.tar.bz2 nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.tar.lz nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.tar.xz nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.tar.zst nixlib-441d85c4c50214128fc4a4dfa138edf250414e03.zip |
pantheon.switchboard-plug-keyboard: 2.3.5 -> 2.3.6
Diffstat (limited to 'pkgs/desktops/pantheon/apps/switchboard-plugs')
-rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix | 18 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch | 22 |
2 files changed, 2 insertions, 38 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 81a694f2ea93..bb563796eab9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17iijb7imxw5zv7vkrbc1vsp87k900yqgyv7ycz1gw37xb4klsyp"; + sha256 = "08zpw7ygrqmwwznvxkf4xbrgwbjkbwc95sw1ikikg3143ql9qclp"; }; passthru = { @@ -51,20 +51,6 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - (substituteAll { - src = ./xkb.patch; - config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"; - }) - # Fix build with latest vala. - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/28fa960f607f0b1d67f2864965a079bdfc23e3a8.patch"; - sha256 = "0121qcg8n7gkz7gpwrxc1cx0nnypj02zy2jmp3cks5r9sc0yi0hw"; - }) - ]; - - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Keyboard Plug"; homepage = https://github.com/elementary/switchboard-plug-keyboard; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch deleted file mode 100644 index 33237d9c9392..000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/Layout/Handler.vala b/src/Layout/Handler.vala -index 297314b..b36509a 100644 ---- a/src/Layout/Handler.vala -+++ b/src/Layout/Handler.vala -@@ -29,7 +29,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object { - } - - private void parse_layouts () { -- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); -+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); - if (doc == null) { - critical ("'evdev.xml' not found or permissions missing\n"); - return; -@@ -76,7 +76,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object { - public HashTable<string, string> get_variants_for_language (string language) { - var returned_table = new HashTable<string, string> (str_hash, str_equal); - returned_table.set ("", _("Default")); -- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); -+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); - if (doc == null) { - critical ("'evdev.xml' not found or permissions incorrect\n"); - return returned_table; |