maestral-qt: fix qt6 usage and crash on wayland
This commit is contained in:
parent
d67818b555
commit
e7d2400cd7
2 changed files with 9 additions and 5 deletions
|
@ -1,8 +1,11 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, qt6
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
, nixosTests
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
@ -28,12 +31,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qtsvg # Needed for the systray icon
|
||||
qtwayland
|
||||
qtbase
|
||||
qtsvg # Needed for the systray icon
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
|
|
@ -35386,7 +35386,7 @@ with pkgs;
|
|||
|
||||
maestral = with python3Packages; toPythonApplication maestral;
|
||||
|
||||
maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };
|
||||
maestral-gui = qt6.callPackage ../applications/networking/maestral-qt { };
|
||||
|
||||
maestro = callPackage ../development/mobile/maestro { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue