diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-08 17:56:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-08 17:56:41 +0200 |
commit | 398c416a4f313365000f6a9e6ef15469bd1359bd (patch) | |
tree | 2b218655ed696e77e780de255b3878453bdf19a1 /pkgs/tools/inputmethods | |
parent | e6903f1e94803841e21e24c0a5cc52215e2d233d (diff) | |
parent | 621cda44c92408d9283efd023da349f22733c95e (diff) | |
download | nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.tar nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.tar.gz nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.tar.bz2 nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.tar.lz nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.tar.xz nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.tar.zst nixpkgs-398c416a4f313365000f6a9e6ef15469bd1359bd.zip |
Merge pull request #125888 from yanganto/hime-0.9.11
hime: unstable-2020-06-27 -> 0.9.11
Diffstat (limited to 'pkgs/tools/inputmethods')
-rw-r--r-- | pkgs/tools/inputmethods/hime/default.nix | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 988f8941d14..4c86fb04cf0 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -1,27 +1,40 @@ -{ -stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib, +{ stdenv +, fetchFromGitHub +, pkg-config +, which +, gtk2 +, gtk3 +, qt4 +, qt5 +, libXtst +, lib +, libchewing +, unixtools +, anthy }: -# chewing and anthy do not work well -# so we do not enable these input method at this moment - -stdenv.mkDerivation { - name = "hime"; - version = "unstable-2020-06-27"; +stdenv.mkDerivation rec { + pname = "hime"; + version = "0.9.11"; src = fetchFromGitHub { + repo = pname; owner = "hime-ime"; - repo = "hime"; - rev = "c89751a58836906e6916355fd037fc74fd7a7a15"; - sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x"; + rev = "v${version}"; + sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI="; }; - nativeBuildInputs = [ which pkg-config ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; + nativeBuildInputs = [ which pkg-config unixtools.whereis ]; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ]; preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; dontWrapQtApps = true; + postFixup = '' + hime_rpath=$(patchelf --print-rpath $out/bin/hime) + patchelf --set-rpath $out/lib/hime:$hime_rpath $out/bin/hime + ''; + meta = with lib; { homepage = "http://hime-ime.github.io/"; |