ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 20:02:14 +03:00
Code Issues Projects Releases Wiki Activity

pantheon.switchboard-plug-keyboard: 2.5.1 -> 2.6.0

Browse Source
This commit is contained in:
Bobby Rong 2021-11-24 08:44:44 +08:00
parent 96e5b267fd
commit f3b5da17e8
No known key found for this signature in database
GPG Key ID: ED07364437C91161
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, nix-update-script , nix-update-script
, pantheon , pantheon
@ -8,32 +9,35 @@
, pkg-config , pkg-config
, vala , vala
, libgee , libgee
, gnome-settings-daemon
, granite , granite
, gsettings-desktop-schemas
, gtk3 , gtk3
, libhandy , libhandy
, libxml2 , libxml2
, libgnomekbd , libgnomekbd
, libxklavier , libxklavier
, ibus , ibus
, onboard
, switchboard , switchboard
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard"; pname = "switchboard-plug-keyboard";
version = "2.5.1"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y"; sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
}; };
patches = [ patches = [
./0001-Remove-Install-Unlisted-Engines-function.patch ./0001-Remove-Install-Unlisted-Engines-function.patch
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
ibus = ibus; inherit ibus onboard;
}) })
]; ];
@ -52,7 +56,9 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome-settings-daemon # media-keys
granite granite
gsettings-desktop-schemas
gtk3 gtk3
ibus ibus
libgee libgee

17
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala 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 --- a/src/Views/InputMethod.vala
+++ b/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 () { private void spawn_ibus_daemon () {
bool is_spawn_succeeded = false; bool is_spawn_succeeded = false;
try { try {
@ -11,3 +11,16 @@ index 6d79fdc..de4276e 100644
} catch (GLib.SpawnError e) { } catch (GLib.SpawnError e) {
warning (e.message); warning (e.message);
set_visible_view (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);