mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

qt6Packages.fcitx5-qt: init

Browse source
This commit is contained in:
Nick Cao 2024-02-28 22:28:22 -05:00
parent c6caed479a
commit 6479f63ecb
No known key found for this signature in database
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
View file

@ -1,19 +1,19 @@
{ lib { lib
, mkDerivation , stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
, fcitx5 , fcitx5
, qtx11extras
, libxcb
, libXdmcp
, qtbase , qtbase
, qt6 , qtwayland
, wrapQtAppsHook
, wayland , wayland
}: }:
let
mkDerivation rec { majorVersion = lib.versions.major qtbase.version;
pname = "fcitx5-qt"; in
stdenv.mkDerivation rec {
pname = "fcitx5-qt${majorVersion}";
version = "5.1.4"; version = "5.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -23,30 +23,28 @@ mkDerivation rec {
sha256 = "sha256-bVH2US/uEZGERslnAh/fyUbzR9fK1UfG4J+mOmrIE8Y="; sha256 = "sha256-bVH2US/uEZGERslnAh/fyUbzR9fK1UfG4J+mOmrIE8Y=";
}; };
preConfigure = '' postPatch = ''
substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \
--replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
substituteInPlace qt6/platforminputcontext/CMakeLists.txt \
--replace \$"{CMAKE_INSTALL_QT6PLUGINDIR}" $out/${qt6.qtbase.qtPluginPrefix}
''; '';
cmakeFlags = [ cmakeFlags = [
# adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies "-DENABLE_QT4=OFF"
"-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" "-DENABLE_QT5=OFF"
"-DENABLE_QT4=0" "-DENABLE_QT6=OFF"
"-DENABLE_QT6=1" "-DENABLE_QT${majorVersion}=ON"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
extra-cmake-modules extra-cmake-modules
wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
qtbase
qtwayland
fcitx5 fcitx5
qtx11extras
libxcb
libXdmcp
wayland wayland
]; ];

2
pkgs/top-level/qt6-packages.nix
View file

@ -32,6 +32,8 @@ makeScopeWithSplicing' {
accounts-qt = callPackage ../development/libraries/accounts-qt { }; accounts-qt = callPackage ../development/libraries/accounts-qt { };
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
kdsoap = callPackage ../development/libraries/kdsoap { }; kdsoap = callPackage ../development/libraries/kdsoap { };
kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; kcolorpicker = callPackage ../development/libraries/kcolorpicker { };