Unverified Commit 28ce4476 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

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

maestral-gui: fix crash on wayland by using `qtwayland` and `qt6.callPackage`
parents da35c07d e7d2400c

pkgs/applications/networking/maestral-qt/default.nix

+8 −4
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };