diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-12-15 02:20:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-15 02:20:19 +0100 |
commit | 778a256ee9838bd19985611edf5bf17605ef1f57 (patch) | |
tree | 530e98d695f4567d07169ca33af1b93444d2ce98 /pkgs/applications | |
parent | 7e0d6f6d6db4f2c9d41a66bc7faba4581625346e (diff) | |
parent | 90d5382750b6f6923dbb9f25766367011230b941 (diff) | |
download | nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.tar nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.tar.gz nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.tar.bz2 nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.tar.lz nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.tar.xz nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.tar.zst nixlib-778a256ee9838bd19985611edf5bf17605ef1f57.zip |
Merge pull request #271652 from teutat3s/qMasterPassword-v2.0
qMasterPassword: 1.2.4 -> 2.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/qMasterPassword/default.nix | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 8ac8ae5f4f55..436c1fc70377 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -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 = '' |