Merge pull request #157282 from teutat3s/feature/qMasterPassword-fixes
qMasterPassword: 1.2.2 -> git master
This commit is contained in:
commit
c7ec7379d8
1 changed files with 12 additions and 8 deletions
|
@ -1,18 +1,18 @@
|
|||
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }:
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "qMasterPassword";
|
||||
version = "1.2.2";
|
||||
pname = "qMasterPassword-unstable";
|
||||
version = "2022-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bkueng";
|
||||
repo = name;
|
||||
rev = "v${version}";
|
||||
sha256 = "0l0jarvfdc69rcjl2wa0ixq8gp3fmjsy9n84m38sxf3n9j2bh13c";
|
||||
repo = "qMasterPassword";
|
||||
rev = "7ade33952531731c266c2597f4212c93aca68c59";
|
||||
sha256 = "sha256-MdV6AkRh072++sKoeuwvhgqLEfUkTF34xt6OH9n59Q0=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
# Upstream install is mostly defunct. It hardcodes target.path and doesn't
|
||||
# install anything but the binary.
|
||||
|
@ -22,12 +22,16 @@ mkDerivation rec {
|
|||
ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword
|
||||
'' else ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps}
|
||||
mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps,qMasterPassword/translations}
|
||||
mv qMasterPassword $out/bin
|
||||
mv data/qMasterPassword.desktop $out/share/applications
|
||||
mv LICENSE README.md $out/share/doc/qMasterPassword
|
||||
mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png
|
||||
mv data/icons/* $out/share/icons/qmasterpassword
|
||||
lrelease ./data/translations/translation_de.ts
|
||||
lrelease ./data/translations/translation_pl.ts
|
||||
mv ./data/translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm
|
||||
mv ./data/translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue