Merge pull request #268978 from ppenguin/qt6-fix-maestral-qt

maestral-gui: fix crash on wayland by using `qtwayland` and `qt6.callPackage`
2023-11-22 22:15:38 -05:00
parent da35c07d23 e7d2400cd7
commit 28ce447690
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;
@@ -35409,7 +35409,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 { };