lxqt: port to qt6 and add some compatibility packages

+46 -11
+45 -10
pkgs/desktops/lxqt/default.nix
··· 1 - { pkgs, makeScope, libsForQt5, qt5 }: 2 let 3 packages = self: with self; { 4 ··· 29 lxqt-sudo = callPackage ./lxqt-sudo {}; 30 lxqt-themes = callPackage ./lxqt-themes {}; 31 pavucontrol-qt = callPackage ./pavucontrol-qt {}; 32 - qtermwidget = callPackage ./qtermwidget {}; 33 34 ### CORE 2 35 lxqt-panel = callPackage ./lxqt-panel {}; ··· 37 pcmanfm-qt = callPackage ./pcmanfm-qt {}; 38 39 ### OPTIONAL 40 - qterminal = callPackage ./qterminal {}; 41 - compton-conf = callPackage ./compton-conf {}; 42 obconf-qt = callPackage ./obconf-qt {}; 43 lximage-qt = callPackage ./lximage-qt {}; 44 qps = callPackage ./qps {}; 45 screengrab = callPackage ./screengrab {}; 46 - qlipper = callPackage ./qlipper {}; 47 lxqt-archiver = callPackage ./lxqt-archiver {}; 48 xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {}; 49 50 preRequisitePackages = [ 51 - libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel 52 - libsForQt5.libkscreen # provides plugins for screen management software 53 pkgs.libfm 54 pkgs.libfm-extra 55 pkgs.menu-cache 56 pkgs.openbox # default window manager 57 - qt5.qtsvg # provides QT5 plugins for svg icons 58 ]; 59 60 corePackages = [ ··· 100 screengrab 101 102 ### Default icon theme 103 - libsForQt5.breeze-icons 104 105 ### Screen saver 106 pkgs.xscreensaver ··· 108 109 }; 110 in 111 - makeScope libsForQt5.newScope packages
··· 1 + { pkgs, makeScope, kdePackages }: 2 + 3 let 4 packages = self: with self; { 5 ··· 30 lxqt-sudo = callPackage ./lxqt-sudo {}; 31 lxqt-themes = callPackage ./lxqt-themes {}; 32 pavucontrol-qt = callPackage ./pavucontrol-qt {}; 33 + qtermwidget = callPackage ./qtermwidget { 34 + lxqt-build-tools = lxqt-build-tools_0_13; 35 + inherit (pkgs.libsForQt5) qtbase qttools; 36 + }; 37 38 ### CORE 2 39 lxqt-panel = callPackage ./lxqt-panel {}; ··· 41 pcmanfm-qt = callPackage ./pcmanfm-qt {}; 42 43 ### OPTIONAL 44 + qterminal = callPackage ./qterminal { 45 + lxqt-build-tools = lxqt-build-tools_0_13; 46 + inherit (pkgs.libsForQt5) qtbase qttools qtx11extras; 47 + }; 48 + compton-conf = callPackage ./compton-conf { 49 + lxqt-build-tools = lxqt-build-tools_0_13; 50 + inherit (pkgs.libsForQt5) qtbase qttools qtx11extras; 51 + }; 52 obconf-qt = callPackage ./obconf-qt {}; 53 lximage-qt = callPackage ./lximage-qt {}; 54 qps = callPackage ./qps {}; 55 screengrab = callPackage ./screengrab {}; 56 + qlipper = callPackage ./qlipper { 57 + inherit (pkgs.libsForQt5) qtbase qttools; 58 + }; 59 lxqt-archiver = callPackage ./lxqt-archiver {}; 60 xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {}; 61 62 + ### COMPATIBILITY 63 + lxqt-build-tools_0_13 = callPackage ./lxqt-build-tools { 64 + version = "0.13.0"; 65 + inherit (pkgs.libsForQt5) qtbase; 66 + }; 67 + libqtxdg_3_12 = callPackage ./libqtxdg { 68 + version = "3.12.0"; 69 + lxqt-build-tools = lxqt-build-tools_0_13; 70 + inherit (pkgs.libsForQt5) qtbase qtsvg; 71 + }; 72 + libfm-qt_1_4 = callPackage ./libfm-qt { 73 + version = "1.4.0"; 74 + lxqt-build-tools = lxqt-build-tools_0_13; 75 + inherit (pkgs.libsForQt5) qttools qtx11extras; 76 + }; 77 + lxqt-qtplugin_1_4 = callPackage ./lxqt-qtplugin { 78 + version = "1.4.1"; 79 + lxqt-build-tools = lxqt-build-tools_0_13; 80 + libqtxdg = libqtxdg_3_12; 81 + libfm-qt = libfm-qt_1_4; 82 + inherit (pkgs.libsForQt5) qtbase qtsvg qttools libdbusmenu; 83 + }; 84 + 85 preRequisitePackages = [ 86 + kdePackages.kwindowsystem # provides some QT plugins needed by lxqt-panel 87 + kdePackages.libkscreen # provides plugins for screen management software 88 pkgs.libfm 89 pkgs.libfm-extra 90 pkgs.menu-cache 91 pkgs.openbox # default window manager 92 + kdePackages.qtsvg # provides QT plugins for svg icons 93 ]; 94 95 corePackages = [ ··· 135 screengrab 136 137 ### Default icon theme 138 + kdePackages.breeze-icons 139 140 ### Screen saver 141 pkgs.xscreensaver ··· 143 144 }; 145 in 146 + makeScope kdePackages.newScope packages
+1 -1
pkgs/top-level/all-packages.nix
··· 37928 lxqt = recurseIntoAttrs (import ../desktops/lxqt { 37929 inherit pkgs; 37930 inherit (lib) makeScope; 37931 - inherit qt5 libsForQt5; 37932 }); 37933 37934 mate = recurseIntoAttrs (callPackage ../desktops/mate { });
··· 37928 lxqt = recurseIntoAttrs (import ../desktops/lxqt { 37929 inherit pkgs; 37930 inherit (lib) makeScope; 37931 + inherit kdePackages; 37932 }); 37933 37934 mate = recurseIntoAttrs (callPackage ../desktops/mate { });