nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #271652 from teutat3s/qMasterPassword-v2.0

Browse Source 
qMasterPassword: 1.2.4 -> 2.0
This commit is contained in:
Peder Bergebakken Sundt 2023-12-15 02:20:19 +01:00 committed by GitHub
commit 778a256ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,27 +3,35 @@
, fetchFromGitHub
, libX11
, libXtst
, qmake
, cmake
, qtbase
, qttools
, qtwayland
, openssl
, libscrypt
, wrapQtAppsHook
, testers
, qMasterPassword
, x11Support ? true
, waylandSupport ? false
}:
stdenv.mkDerivation rec {
pname = "qMasterPassword";
version = "1.2.4";
version = "2.0";
src = fetchFromGitHub {
owner = "bkueng";
repo = pname;
rev = "v${version}";
sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";
hash = "sha256-4qxPjrf6r2S0l/hcs6bqfJm56jdDz+0a0xEkqGBYGBs=";
};
buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
buildInputs = [ qtbase qtwayland openssl libscrypt ] ++ lib.optionals x11Support [ libX11 libXtst ];
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
cmakeFlags = lib.optionals waylandSupport [
"-DDISABLE_FILL_FORM_SHORTCUTS=1"
];
# Upstream install is mostly defunct. It hardcodes target.path and doesn't
# install anything but the binary.
@ -34,17 +42,22 @@ stdenv.mkDerivation rec {
'' else ''
mkdir -p $out/bin
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
cp qMasterPassword $out/bin
cp $src/data/qMasterPassword.desktop $out/share/applications
cp $src/LICENSE $src/README.md $out/share/doc/qMasterPassword
cp $src/data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png
cp $src/data/icons/* $out/share/icons/qmasterpassword
cp ./translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm
cp ./translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm
'';
passthru = {
tests.version = testers.testVersion {
package = qMasterPassword;
version = "v${version}";
};
};
meta = with lib; {
description = "Stateless Master Password Manager";
longDescription = ''

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

@ -40934,7 +40934,12 @@ with pkgs;
gtk2 = gtk2-x11;
};
qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };
qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
qMasterPassword-wayland = qt6Packages.callPackage ../applications/misc/qMasterPassword {
x11Support = false;
waylandSupport = true;
};
qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };