From 4e2b7d7a929ffa4a63328a71853dabd99ed403ca Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:53:13 +0100 Subject: [PATCH] qMasterPassword: back to qt5, qtstyleplugins missing in qt6 --- pkgs/applications/misc/qMasterPassword/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 2cdc3bdd9f3..8ac8ae5f4f5 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89a75938c83..ab3a7f000e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37108,7 +37108,7 @@ with pkgs; gtk2 = gtk2-x11; }; - qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { }; + qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };