mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
libsForQt5.fcitx5-qt: 5.1.1 -> 5.1.3
Diff: https://github.com/fcitx/fcitx5-qt/compare/5.1.1...5.1.3
This commit is contained in:
parent
7359b44228
commit
06eebe5f49
@ -9,17 +9,18 @@
|
|||||||
, libXdmcp
|
, libXdmcp
|
||||||
, qtbase
|
, qtbase
|
||||||
, qt6
|
, qt6
|
||||||
|
, wayland
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "fcitx5-qt";
|
pname = "fcitx5-qt";
|
||||||
version = "5.1.1";
|
version = "5.1.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-IkaaLFMyPVaL5taRN4e+QxMEsNhhXlA1fWBn/6PeGnI=";
|
sha256 = "sha256-qXQ5nvPV5YHD8MFfeqgF8kyk0zf28lWxM8SUo3T6TzA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@ -31,7 +32,7 @@ mkDerivation rec {
|
|||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
# adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies
|
# adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies
|
||||||
"-DCMAKE_PREFIX_PATH=${qt6.qtbase}"
|
"-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}"
|
||||||
"-DENABLE_QT4=0"
|
"-DENABLE_QT4=0"
|
||||||
"-DENABLE_QT6=1"
|
"-DENABLE_QT6=1"
|
||||||
];
|
];
|
||||||
@ -46,6 +47,7 @@ mkDerivation rec {
|
|||||||
qtx11extras
|
qtx11extras
|
||||||
libxcb
|
libxcb
|
||||||
libXdmcp
|
libXdmcp
|
||||||
|
wayland
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user