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

pantheon.wingpanel-indicator-keyboard: 2.2.0 -> 2.2.1

Browse Source
This commit is contained in:
worldofpeace 2020-04-03 17:13:59 -04:00
parent a715607577
commit 777fe621fa
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard"; pname = "wingpanel-indicator-keyboard";
version = "2.2.0"; version = "2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0jc12xfaj3micpjssxc7m6hzssvyq26ln5az05x5f1j6v8lccbyn"; sha256 = "0q32qc6jh5w0i1ixkl59pys8r3hxmbig8854q7sxi07vlk9g3i7y";
}; };
passthru = { passthru = {
@ -45,18 +45,16 @@ stdenv.mkDerivation rec {
gtk3 gtk3
libgee libgee
wingpanel wingpanel
xorg.xkeyboardconfig
]; ];
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
libgnomekbd_path = "${libgnomekbd}/bin/"; gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml";
}) })
]; ];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Keyboard Indicator for Wingpanel"; description = "Keyboard Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-keyboard; homepage = https://github.com/elementary/wingpanel-indicator-keyboard;

17
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala diff --git a/src/Indicator.vala b/src/Indicator.vala
index cd7ca49..0bef9c7 100644 index cd7ca49..7813789 100644
--- a/src/Indicator.vala --- a/src/Indicator.vala
+++ b/src/Indicator.vala +++ b/src/Indicator.vala
@@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator { @@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
@ -7,20 +7,7 @@ index cd7ca49..0bef9c7 100644
close (); close ();
- string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\""; - string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
+ string command = "@libgnomekbd_path@gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\""; + string command = "@gkbd_keyboard_display@ \"--layout=" + layouts.get_current_with_variant () + "\"";
try { try {
AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null); AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);
diff --git a/src/LayoutsManager.vala b/src/LayoutsManager.vala
index 1bac80e..67df847 100644
--- a/src/LayoutsManager.vala
+++ b/src/LayoutsManager.vala
@@ -97,7 +97,7 @@ public class Keyboard.Widgets.LayoutManager : Gtk.ScrolledWindow {
public string? get_name_for_xkb_layout (string language, string? variant) {
debug ("get_name_for_xkb_layout (%s, %s)", language, variant);
- 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 null;