diff options
| author | teutat3s <10206665+teutat3s@users.noreply.github.com> | 2023-12-02 13:27:11 +0100 |
|---|---|---|
| committer | teutat3s <10206665+teutat3s@users.noreply.github.com> | 2023-12-11 20:15:30 +0100 |
| commit | a025483a41eba6da06665b11228a963abefcc3c6 (patch) | |
| tree | 24a6a3d7edfdd852f8c5eecf297318161c7d4c85 /pkgs/applications | |
| parent | eac9180f29e108a52cb5384caa802da736c2c3bc (diff) | |
| download | nixlib-a025483a41eba6da06665b11228a963abefcc3c6.tar nixlib-a025483a41eba6da06665b11228a963abefcc3c6.tar.gz nixlib-a025483a41eba6da06665b11228a963abefcc3c6.tar.bz2 nixlib-a025483a41eba6da06665b11228a963abefcc3c6.tar.lz nixlib-a025483a41eba6da06665b11228a963abefcc3c6.tar.xz nixlib-a025483a41eba6da06665b11228a963abefcc3c6.tar.zst nixlib-a025483a41eba6da06665b11228a963abefcc3c6.zip | |
qMasterPassword: 1.2.4 -> 2.0
https://github.com/bkueng/qMasterPassword/compare/v1.2.4...v2.0 Use Qt6 Add wayland variant which uses no x11 build dependencies and disables form filling features
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/qMasterPassword/default.nix | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 8ac8ae5f4f55..a2be621ad149 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -3,27 +3,33 @@ , fetchFromGitHub , libX11 , libXtst -, qmake +, cmake , qtbase , qttools +, qtwayland , openssl , libscrypt , wrapQtAppsHook +, 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,15 +40,13 @@ 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 ''; meta = with lib; { |