Unverified Commit 3f27a6e6 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #221472 from teutat3s/fix/qMasterPassword-styles 

qMasterPassword: back to qt5, qtstyleplugins missing in qt6
parents ae660ed7 4e2b7d7a

pkgs/applications/misc/qMasterPassword/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
, qmake

, qtbase

, qttools

, qtwayland

, openssl

, libscrypt

, wrapQtAppsHook
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";

  };



  buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ];

  buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];

  nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];



  # Upstream install is mostly defunct. It hardcodes target.path and doesn't

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -38525,7 +38525,7 @@ with pkgs; 
    gtk2 = gtk2-x11;

  };













  qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };













  qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };





























  qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };