Unverified Commit 0b5b74bb authored by Nick Cao's avatar Nick Cao
Browse files

fcitx5-skk: build for both qt versions

parent 9336fcc5

pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix

+5 −3
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
, libskk

, qtbase

, skk-dicts

, wrapQtAppsHook

, enableQt ? false

}:
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec { 
    extra-cmake-modules

    gettext

    pkg-config

  ] ++ lib.optional enableQt wrapQtAppsHook;

  ];



  buildInputs = [

    fcitx5
@@ -41,10 +40,13 @@ stdenv.mkDerivation rec { 
  ];



  cmakeFlags = [

    "-DENABLE_QT=${toString enableQt}"

    (lib.cmakeBool "ENABLE_QT" enableQt)

    (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))

    "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.L"

  ];



  dontWrapQtApps = true;



  meta = with lib; {

    description = "Input method engine for Fcitx5, which uses libskk as its backend";

    homepage = "https://github.com/fcitx/fcitx5-skk";

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ mapAliases ({ 
  fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13

  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



  ### G ###



  g4py = python3Packages.geant4; # Added 2020-06-06

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -8056,11 +8056,7 @@ with pkgs; 
    };

  };













  fcitx5-skk = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };

























  fcitx5-skk-qt = fcitx5-skk.override {













    enableQt = true;













  };













  fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };





























  fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };







































pkgs/top-level/qt5-packages.nix



+2
−0






























Original line number
Diff line number
Diff line








@@ -100,6 +100,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP





























  fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };





























  fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };





























  futuresql = callPackage ../development/libraries/futuresql { };































  qgpgme = callPackage ../development/libraries/gpgme { };

































pkgs/top-level/qt6-packages.nix



+2
−0






























Original line number
Diff line number
Diff line








@@ -34,6 +34,8 @@ makeScopeWithSplicing' {





























  fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };





























  fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };





























  kdsoap = callPackage ../development/libraries/kdsoap { };































  kcolorpicker = callPackage ../development/libraries/kcolorpicker { };