mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-03 19:17:38 +03:00
pantheon.switchboard-plug-keyboard: 2.5.1 -> 2.6.0
This commit is contained in:
parent
96e5b267fd
commit
f3b5da17e8
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
@ -8,32 +9,35 @@
|
||||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, gnome-settings-daemon
|
||||
, granite
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, libhandy
|
||||
, libxml2
|
||||
, libgnomekbd
|
||||
, libxklavier
|
||||
, ibus
|
||||
, onboard
|
||||
, switchboard
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-keyboard";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y";
|
||||
sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Remove-Install-Unlisted-Engines-function.patch
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
ibus = ibus;
|
||||
inherit ibus onboard;
|
||||
})
|
||||
];
|
||||
|
||||
@ -52,7 +56,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome-settings-daemon # media-keys
|
||||
granite
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
ibus
|
||||
libgee
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala
|
||||
index 6d79fdc..de4276e 100644
|
||||
index 7f73c1e1..1f0d6400 100644
|
||||
--- a/src/Views/InputMethod.vala
|
||||
+++ b/src/Views/InputMethod.vala
|
||||
@@ -325,7 +325,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
|
||||
@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
|
||||
private void spawn_ibus_daemon () {
|
||||
bool is_spawn_succeeded = false;
|
||||
try {
|
||||
@ -11,3 +11,16 @@ index 6d79fdc..de4276e 100644
|
||||
} catch (GLib.SpawnError e) {
|
||||
warning (e.message);
|
||||
set_visible_view (e.message);
|
||||
diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala
|
||||
index 75d2d805..b86252a4 100644
|
||||
--- a/src/Views/Layout.vala
|
||||
+++ b/src/Views/Layout.vala
|
||||
@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard {
|
||||
|
||||
onscreen_keyboard_settings.clicked.connect (() => {
|
||||
try {
|
||||
- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
|
||||
+ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
|
||||
appinfo.launch (null, null);
|
||||
} catch (Error e) {
|
||||
warning ("Unable to launch onboard-settings: %s", e.message);
|
||||
|
Loading…
Reference in New Issue
Block a user