alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #96000 from gebner/mozc_wrapping

Browse source
This commit is contained in:
Gabriel Ebner 2020-08-22 18:22:30 +02:00 committed by GitHub
parent 9562573d26 8309faafc3
commit b679e8d070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
View file

@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec {
sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
};
nativeBuildInputs = [ gyp which ninja python pkgconfig ];
nativeBuildInputs = [ gyp which ninja python pkgconfig qt5.wrapQtAppsHook ];
buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ];
postUnpack = ''
@ -79,6 +79,8 @@ in clangStdenv.mkDerivation rec {
install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server
install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool
wrapQtApp $out/lib/mozc/mozc_tool
install -D -m 755 out_linux/Release/fcitx-mozc.so $out/lib/fcitx/fcitx-mozc.so
install -D -m 644 unix/fcitx/fcitx-mozc.conf $out/share/fcitx/addon/fcitx-mozc.conf
install -D -m 644 unix/fcitx/mozc.conf $out/share/fcitx/inputmethod/mozc.conf

3
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
View file

@ -21,7 +21,7 @@ in clangStdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ];
};
nativeBuildInputs = [ which ninja python gyp pkgconfig ];
nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ];
buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
src = fetchFromGitHub {
@ -70,6 +70,7 @@ in clangStdenv.mkDerivation rec {
install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server
install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool
wrapQtApp $out/lib/mozc/mozc_tool
install -d $out/share/doc/mozc
install -m 644 data/installer/*.html $out/share/doc/mozc/