diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-02-28 22:28:22 -0500 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2024-02-28 22:29:08 -0500 |
| commit | 6479f63ecb8c8649f78e91b12c079b387686bc73 (patch) | |
| tree | 036106170bb1e40cb6f1e56e304e6993b78f65e2 /pkgs/tools | |
| parent | c6caed479a521fd96b847d287c3fbdc611ffdca3 (diff) | |
| download | nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.tar nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.tar.gz nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.tar.bz2 nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.tar.lz nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.tar.xz nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.tar.zst nixlib-6479f63ecb8c8649f78e91b12c079b387686bc73.zip | |
qt6Packages.fcitx5-qt: init
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 202886e4e8e1..5311d20ffa32 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,19 +1,19 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , extra-cmake-modules , fcitx5 -, qtx11extras -, libxcb -, libXdmcp , qtbase -, qt6 +, qtwayland +, wrapQtAppsHook , wayland }: - -mkDerivation rec { - pname = "fcitx5-qt"; +let + majorVersion = lib.versions.major qtbase.version; +in +stdenv.mkDerivation rec { + pname = "fcitx5-qt${majorVersion}"; version = "5.1.4"; src = fetchFromGitHub { @@ -23,30 +23,28 @@ mkDerivation rec { sha256 = "sha256-bVH2US/uEZGERslnAh/fyUbzR9fK1UfG4J+mOmrIE8Y="; }; - preConfigure = '' - substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ - --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} - substituteInPlace qt6/platforminputcontext/CMakeLists.txt \ - --replace \$"{CMAKE_INSTALL_QT6PLUGINDIR}" $out/${qt6.qtbase.qtPluginPrefix} + postPatch = '' + substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix} ''; cmakeFlags = [ - # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies - "-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" - "-DENABLE_QT4=0" - "-DENABLE_QT6=1" + "-DENABLE_QT4=OFF" + "-DENABLE_QT5=OFF" + "-DENABLE_QT6=OFF" + "-DENABLE_QT${majorVersion}=ON" ]; nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ + qtbase + qtwayland fcitx5 - qtx11extras - libxcb - libXdmcp wayland ]; |