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

Merge pull request #200029 from teutat3s/bump/qMasterpassword

Browse Source
This commit is contained in:
Sandro 2022-11-11 11:41:26 +01:00 committed by GitHub
commit 61249a63f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/misc/qMasterPassword/default.nix
View File

@ -1,18 +1,30 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }: { lib
, stdenv
, fetchFromGitHub
, libX11
, libXtst
, qmake
, qtbase
, qttools
, qtwayland
, openssl
, libscrypt
, wrapQtAppsHook
}:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "qMasterPassword"; pname = "qMasterPassword";
version = "1.2.3"; version = "1.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bkueng"; owner = "bkueng";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-eUJD9FoGaDzADKm3wZHs5Bhdt7RoM1WTTVNP6xUV7gs="; sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";
}; };
buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ];
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
# Upstream install is mostly defunct. It hardcodes target.path and doesn't # Upstream install is mostly defunct. It hardcodes target.path and doesn't
# install anything but the binary. # install anything but the binary.
@ -46,7 +58,7 @@ mkDerivation rec {
''; '';
homepage = "https://github.com/bkueng/qMasterPassword"; homepage = "https://github.com/bkueng/qMasterPassword";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.tadeokondrak ]; maintainers = with lib.maintainers; [ tadeokondrak teutat3s ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -37081,7 +37081,7 @@ with pkgs;
gtk2 = gtk2-x11; gtk2 = gtk2-x11;
}; };
qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };