diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2018-11-23 14:11:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-23 14:11:58 +0100 |
commit | 80e9f77ed5b541f6ee822910c4cad9ce428bdf10 (patch) | |
tree | 7fd8e30ee8c31b2b8211b42ed8f6d1872bfa2693 /pkgs | |
parent | 1bf18e4c852c52e13842e71f70dec1752bb4297b (diff) | |
parent | 624966ab69de87d307ed9912af892c596a65b1b7 (diff) | |
download | nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.tar nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.tar.gz nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.tar.bz2 nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.tar.lz nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.tar.xz nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.tar.zst nixpkgs-80e9f77ed5b541f6ee822910c4cad9ce428bdf10.zip |
Merge pull request #50475 from Pneumaticat/ibus-table-chinese-init
ibus-table-chinese: init at 1.8.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix | 64 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 69 insertions, 0 deletions
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix new file mode 100644 index 00000000000..368de091777 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchgit, fetchFromGitHub, pkgconfig, ibus, ibus-table, python3, cmake }: + +let + src = fetchFromGitHub { + owner = "definite"; + repo = "ibus-table-chinese"; + rev = "f1f6a3384f021caa3b84c517e2495086f9c34507"; + sha256 = "14wpw3pvyrrqvg7al37jk2dxqfj9r4zf88j8k2n2lmdc50f3xs7k"; + }; + + cmakeFedoraSrc = fetchgit { + url = "https://pagure.io/cmake-fedora.git"; + rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992"; + sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n"; + }; +in stdenv.mkDerivation rec { + name = "ibus-table-chinese-${version}"; + version = "1.8.2"; + + srcs = [ src cmakeFedoraSrc ]; + sourceRoot = src.name; + + postUnpack = '' + chmod u+w -R ${cmakeFedoraSrc.name} + mv ${cmakeFedoraSrc.name}/* source/cmake-fedora + ''; + + preConfigure = '' + # cmake script needs ./Modules folder to link to cmake-fedora + ln -s cmake-fedora/Modules ./ + ''; + + # Fails when writing to /prj_info.cmake in https://pagure.io/cmake-fedora/blob/master/f/Modules/ManageVersion.cmake + cmakeFlags = [ "-DPRJ_INFO_CMAKE_FILE=/dev/null" "-DPRJ_DOC_DIR=REPLACE" "-DDATA_DIR=share" ]; + # Must replace PRJ_DOC_DIR with actual share/ folder for ibus-table-chinese + # Otherwise it tries to write to /ibus-table-chinese if not defined (!) + postConfigure = '' + substituteInPlace cmake_install.cmake --replace '/build/source/REPLACE' $out/share/ibus-table-chinese + ''; + # Fails otherwise with "no such file or directory: <table>.txt" + dontUseCmakeBuildDir = true; + # Fails otherwise sometimes with + # FileExistsError: [Errno 17] File exists: '/build/tmp.BfVAUM4llr/ibus-table-chinese/.local/share/ibus-table' + enableParallelBuilding = false; + + preBuild = '' + export HOME=$(mktemp -d)/ibus-table-chinese + ''; + + postFixup = '' + rm -rf $HOME + ''; + + buildInputs = [ pkgconfig ibus ibus-table python3 cmake ]; + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "Chinese tables for IBus-Table"; + homepage = https://github.com/definite/ibus-table-chinese; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ pneumaticat ]; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 0d467a6875b..d09806402af 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { -e "/export IBUS_DATAROOTDIR=/ s/^.$//" \ -e "/export IBUS_LOCALEDIR=/ s/^.$//" \ -i "setup/ibus-setup-table.in" + substituteInPlace engine/tabcreatedb.py --replace '/usr/share/ibus-table' $out/share/ibus-table ''; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e4b9911b6d..3bce8a01998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1999,6 +1999,10 @@ with pkgs; inherit (gnome3) dconf; }; + table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { + ibus-table = ibus-engines.table; + }; + table-others = callPackage ../tools/inputmethods/ibus-engines/ibus-table-others { ibus-table = ibus-engines.table; }; |