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

fcitx5-unikey: build for both qt versions

Browse Source
This commit is contained in:
Nick Cao 2024-01-08 16:08:12 -05:00
parent 0b5b74bbeb
commit 51f1291ea5
No known key found for this signature in database
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
View File

@ -6,7 +6,7 @@
, fcitx5
, fcitx5-qt
, gettext
, wrapQtAppsHook
, qtbase
}:
stdenv.mkDerivation rec {
@ -20,9 +20,23 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wrsA0gSexOZgsJunozt49GyP9R3Xe2Aci7Q8p3zAM9Q=";
};
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [ fcitx5 fcitx5-qt gettext ];
buildInputs = [
qtbase
fcitx5
fcitx5-qt
gettext
];
cmakeFlags = [
(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
];
dontWrapQtApps = true;
meta = with lib; {
description = "Unikey engine support for Fcitx5";

1
pkgs/top-level/aliases.nix
View File

@ -322,6 +322,7 @@ mapAliases ({
fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13
fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01
fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01
### G ###

2
pkgs/top-level/all-packages.nix
View File

@ -8058,8 +8058,6 @@ with pkgs;
fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };
fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };
fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };
fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { };

2
pkgs/top-level/qt5-packages.nix
View File

@ -102,6 +102,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };
fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };
futuresql = callPackage ../development/libraries/futuresql { };
qgpgme = callPackage ../development/libraries/gpgme { };

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

@ -36,6 +36,8 @@ makeScopeWithSplicing' {
fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };
fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };
kdsoap = callPackage ../development/libraries/kdsoap { };
kcolorpicker = callPackage ../development/libraries/kcolorpicker { };