diff options
| author | pennae <github@quasiparticle.net> | 2023-04-19 01:08:42 +0200 |
|---|---|---|
| committer | pennae <82953136+pennae@users.noreply.github.com> | 2023-04-19 18:32:11 +0200 |
| commit | 1fbb105341234b40decb4669f318c9a91cdd1b9f (patch) | |
| tree | bb90543a1ba0a969ffcb69209e669a6b5b6ed3ab /pkgs/tools/inputmethods/ibus | |
| parent | 846043bcfc920bdcc2eb44b0f1572fe1c4b3486c (diff) | |
ibus: fix build and codepoint/emoji input
see https://github.com/NixOS/nixpkgs/issues/226526, https://github.com/ibus/ibus/issues/2496, https://github.com/NixOS/nixpkgs/pull/218120#issuecomment-1514027173 codepoint and emoji input simply don't show due to runtime initialization issues, and a missing make dependency makes the build flaky.
Diffstat (limited to 'pkgs/tools/inputmethods/ibus')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 381a3a90bab41..140ca8c86ea8d 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , substituteAll , fetchFromGitHub +, fetchpatch , autoreconfHook , gettext , makeWrapper @@ -72,6 +73,12 @@ stdenv.mkDerivation rec { pythonSitePackages = python3.sitePackages; }) ./build-without-dbus-launch.patch + # unicode and emoji input are broken before 1.5.29 + # https://github.com/NixOS/nixpkgs/issues/226526 + (fetchpatch { + url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch"; + hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU="; + }) ]; outputs = [ "out" "dev" "installedTests" ]; @@ -98,6 +105,12 @@ stdenv.mkDerivation rec { "--with-ucd-dir=${unicode-character-database}/share/unicode" ]; + # missing make dependency + # https://github.com/NixOS/nixpkgs/pull/218120#issuecomment-1514027173 + preBuild = '' + make -C src ibusenumtypes.h + ''; + makeFlags = [ "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus" "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" |