gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
qMasterPassword: back to qt5, qtstyleplugins missing in qt6
This commit is contained in:
Weijia Wang
2023-03-16 14:48:09 +02:00
committed by GitHub
parent ae660ed77e 4e2b7d7a92
commit 3f27a6e65f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/qMasterPassword/default.nix
+1 -2
View File
@@ -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
View File
@@ -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 { };