mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Code Issues Wiki Activity

pantheon.switchboard-plug-keyboard: 2.3.5 -> 2.3.6

Browse source
This commit is contained in:
worldofpeace 2020-04-03 17:11:21 -04:00
parent fac751f815
commit 441d85c4c5
2 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View file

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

22
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
View file

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