Skip to content

Commit

Permalink
ibus: fix build and codepoint/emoji input
Browse files Browse the repository at this point in the history
see #226526,
ibus/ibus#2496,
#218120 (comment)

codepoint and emoji input simply don't show due to runtime
initialization issues, and a missing make dependency makes the build flaky.
  • Loading branch information
pennae committed Apr 19, 2023
1 parent 08675a0 commit e988628
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions pkgs/tools/inputmethods/ibus/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib, stdenv
, substituteAll
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, gettext
, makeWrapper
Expand Down Expand Up @@ -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" ];
Expand All @@ -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"
Expand Down

0 comments on commit e988628

Please sign in to comment.