public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ibus-engines: use wrapPythonPrograms

Browse Source 
This is needed now that PYTHONPATH is not propagated. Also several packages
with additional dependencies are now properly wrapped.
This commit is contained in:
Nikolay Amiantov
2017-03-26 02:20:02 +03:00
parent 99434abff7
commit 66b05cd4e6
8 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
{ clangStdenv, fetchFromGitHub, fetchsvn, which, ninja, python2, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
let
japanese_usage_dictionary = fetchsvn {
@@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ];
};
nativeBuildInputs = [ gyp which ninja python pkgconfig ];
nativeBuildInputs = [ which ninja python2 python2.pkgs.gyp pkgconfig ];
buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ];
src = fetchFromGitHub {
@@ -36,8 +36,8 @@ in clangStdenv.mkDerivation rec {
configurePhase = ''
export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc"
python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \
python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin
python src/build_mozc.py gyp --gypdir=${python2.pkgs.gyp}/bin --server_dir=$out/lib/mozc \
python src/unix/fcitx/fcitx.gyp gyp --gypdir=${python2.pkgs.gyp}/bin
'';
preBuildPhase = ''