Merge pull request #187913 from ncfavier/ibus

This commit is contained in:
Sandro
2022-09-05 16:13:21 +02:00
committed by GitHub
2 changed files with 3 additions and 10 deletions
+1
View File
@@ -4,6 +4,7 @@ makeInstalledTest {
tested = pkgs.ibus;
testConfig = {
i18n.supportedLocales = [ "all" ];
i18n.inputMethod.enabled = "ibus";
systemd.user.services.ibus-daemon = {
serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose";
+2 -10
View File
@@ -1,7 +1,5 @@
{ lib, stdenv
, substituteAll
, fetchurl
, fetchpatch
, fetchFromGitHub
, autoreconfHook
, gettext
@@ -60,22 +58,16 @@ in
stdenv.mkDerivation rec {
pname = "ibus";
version = "1.5.26";
version = "1.5.27";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus";
rev = version;
sha256 = "7Vuj4Gyd+dLUoCkR4SPkfGPwVQPRo2pHk0pRAsmtjxc=";
sha256 = "sha256-DwX7SYRb18C0Lz2ySPS3yV99Q1xQezs0Ls2P7Rbtk5Q=";
};
patches = [
# Fixes systemd unit installation path https://github.com/ibus/ibus/pull/2388
(fetchpatch {
url = "https://github.com/ibus/ibus/commit/33b4b3932bfea476a841f8df99e20049b83f4b0e.patch";
sha256 = "kh8SBR+cqsov/B0A2YXLJVq1F171qoSRUKbBPHjPRHI=";
})
(substituteAll {
src = ./fix-paths.patch;
pythonInterpreter = python3Runtime.interpreter;