Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fcitx5: fix reference to fcitx5-with-addons

Browse source
This commit is contained in:
Robert Helgesson 2024-03-05 22:53:10 +01:00
parent 23ff9821bc
commit bdea159ffa
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/i18n/input-method/fcitx5.nix
View file

@ -5,7 +5,8 @@ with lib;
let
im = config.i18n.inputMethod;
cfg = im.fcitx5;
fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
fcitx5Package =
pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
in {
options = {
i18n.inputMethod.fcitx5 = {

23
tests/modules/i18n/input-method/fcitx5-stubs.nix
View file

@ -13,10 +13,8 @@
$out/bin/fcitx5-config-qt
'';
};
fcitx5-configtool = { outPath = null; };
fcitx5-lua = { outPath = null; };
fcitx5-gtk = { outPath = null; };
fcitx5-chinese-addons = { outPath = null; };
gtk2 = {
buildScript = ''
@ -35,18 +33,21 @@
};
nixpkgs.overlays = [
(final: super: {
libsForQt5 = super.libsForQt5.overrideScope' (qt5prev: qt5final: {
fcitx5-qt = super.mkStubPackage { outPath = null; };
});
(final: prev: {
libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: {
fcitx5-chinese-addons = prev.mkStubPackage { outPath = null; };
fcitx5-configtool = prev.mkStubPackage { outPath = null; };
fcitx5-qt = prev.mkStubPackage { outPath = null; };
qt6Packages = super.qt6Packages.overrideScope' (qt6prev: qt6final: {
fcitx5-qt = super.mkStubPackage { outPath = null; };
});
fcitx5-with-addons = super.fcitx5-with-addons.override {
fcitx5-with-addons = qt5prev.fcitx5-with-addons.override {
inherit (final) libsForQt5 qt6Packages;
};
});
qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: {
fcitx5-qt = prev.mkStubPackage { outPath = null; };
});
})
];
}