pyrox.dev
lxqt: port to qt6 and add some compatibility packages
+45
-10
pkgs/desktops/lxqt/default.nix
+45
-10
pkgs/desktops/lxqt/default.nix
···
1
-
{ pkgs, makeScope, libsForQt5, qt5 }:
1
+
{ pkgs, makeScope, kdePackages }:
2
+
2
3
let
3
4
packages = self: with self; {
4
5
···
29
30
lxqt-sudo = callPackage ./lxqt-sudo {};
30
31
lxqt-themes = callPackage ./lxqt-themes {};
31
32
pavucontrol-qt = callPackage ./pavucontrol-qt {};
32
-
qtermwidget = callPackage ./qtermwidget {};
33
+
qtermwidget = callPackage ./qtermwidget {
34
+
lxqt-build-tools = lxqt-build-tools_0_13;
35
+
inherit (pkgs.libsForQt5) qtbase qttools;
36
+
};
33
37
34
38
### CORE 2
35
39
lxqt-panel = callPackage ./lxqt-panel {};
···
37
41
pcmanfm-qt = callPackage ./pcmanfm-qt {};
38
42
39
43
### OPTIONAL
40
-
qterminal = callPackage ./qterminal {};
41
-
compton-conf = callPackage ./compton-conf {};
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
+
};
42
52
obconf-qt = callPackage ./obconf-qt {};
43
53
lximage-qt = callPackage ./lximage-qt {};
44
54
qps = callPackage ./qps {};
45
55
screengrab = callPackage ./screengrab {};
46
-
qlipper = callPackage ./qlipper {};
56
+
qlipper = callPackage ./qlipper {
57
+
inherit (pkgs.libsForQt5) qtbase qttools;
58
+
};
47
59
lxqt-archiver = callPackage ./lxqt-archiver {};
48
60
xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {};
49
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
+
50
85
preRequisitePackages = [
51
-
libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
52
-
libsForQt5.libkscreen # provides plugins for screen management software
86
+
kdePackages.kwindowsystem # provides some QT plugins needed by lxqt-panel
87
+
kdePackages.libkscreen # provides plugins for screen management software
53
88
pkgs.libfm
54
89
pkgs.libfm-extra
55
90
pkgs.menu-cache
56
91
pkgs.openbox # default window manager
57
-
qt5.qtsvg # provides QT5 plugins for svg icons
92
+
kdePackages.qtsvg # provides QT plugins for svg icons
58
93
];
59
94
60
95
corePackages = [
···
100
135
screengrab
101
136
102
137
### Default icon theme
103
-
libsForQt5.breeze-icons
138
+
kdePackages.breeze-icons
104
139
105
140
### Screen saver
106
141
pkgs.xscreensaver
···
108
143
109
144
};
110
145
in
111
-
makeScope libsForQt5.newScope packages
146
+
makeScope kdePackages.newScope packages
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix