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

Merge pull request #65571 from jonringer/fix-fcitx-libpinyin

Browse Source 
libsForQt5.fcitx-qt5: fix build
This commit is contained in:
Matthieu Coudron 2019-07-30 13:53:07 +09:00 committed by GitHub
commit 9db41c12f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
View File

@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
substituteInPlace src/cmake_install.cmake \ substituteInPlace src/cmake_install.cmake \
--replace ${fcitx} $out --replace ${fcitx} $out
substituteInPlace po/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace data/cmake_install.cmake \ substituteInPlace data/cmake_install.cmake \
--replace ${fcitx} $out --replace ${fcitx} $out
substituteInPlace dictmanager/cmake_install.cmake \ substituteInPlace dictmanager/cmake_install.cmake \

14
pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
View File

@ -1,6 +1,12 @@
{ stdenv, fetchFromGitLab, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: { lib, mkDerivation, fetchFromGitLab
, cmake
, extra-cmake-modules
, fcitx
, pkgconfig
, qtbase
}:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "fcitx-qt5"; pname = "fcitx-qt5";
version = "1.2.3"; version = "1.2.3";
@ -17,12 +23,12 @@ stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
substituteInPlace platforminputcontext/cmake_install.cmake \ substituteInPlace platforminputcontext/cmake_install.cmake \
--replace ${qtbase.out} $out --replace ${qtbase.bin} $out
substituteInPlace quickphrase-editor/cmake_install.cmake \ substituteInPlace quickphrase-editor/cmake_install.cmake \
--replace ${fcitx} $out --replace ${fcitx} $out
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = https://gitlab.com/fcitx/fcitx-qt5; homepage = https://gitlab.com/fcitx/fcitx-qt5;
description = "Qt5 IM Module for Fcitx"; description = "Qt5 IM Module for Fcitx";
license = licenses.gpl2; license = licenses.gpl2;