git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #96000 from gebner/mozc_wrapping
commitb679e8d070d6b6adf95e75652ae1231ed4733358 authorGabriel Ebner <gebner@gebner.org> dateSat 22 Aug 2020, 18:22 (6 years ago) parent95625738309faa
2 files changed+5−2
pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix+3−1 pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+2−1
pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix+3−1
@@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec {
2323 sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
2424 };
2525
26− nativeBuildInputs = [ gyp which ninja python pkgconfig ];
26+ nativeBuildInputs = [ gyp which ninja python pkgconfig qt5.wrapQtAppsHook ];
2727 buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ];
2828
2929 postUnpack = ''
@@ -79,6 +79,8 @@ in clangStdenv.mkDerivation rec {
7979 install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server
8080 install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool
8181
82+ wrapQtApp $out/lib/mozc/mozc_tool
83+
8284 install -D -m 755 out_linux/Release/fcitx-mozc.so $out/lib/fcitx/fcitx-mozc.so
8385 install -D -m 644 unix/fcitx/fcitx-mozc.conf $out/share/fcitx/addon/fcitx-mozc.conf
8486 install -D -m 644 unix/fcitx/mozc.conf $out/share/fcitx/inputmethod/mozc.conf
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+2−1
@@ -21,7 +21,7 @@ in clangStdenv.mkDerivation rec {
2121 maintainers = with maintainers; [ gebner ericsagnes ];
2222 };
2323
24− nativeBuildInputs = [ which ninja python gyp pkgconfig ];
24+ nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ];
2525 buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
2626
2727 src = fetchFromGitHub {
@@ -70,6 +70,7 @@ in clangStdenv.mkDerivation rec {
7070
7171 install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server
7272 install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool
73+ wrapQtApp $out/lib/mozc/mozc_tool
7374
7475 install -d $out/share/doc/mozc
7576 install -m 644 data/installer/*.html $out/share/doc/mozc/