diff options
author | Bill Sun <billksun@gmail.com> | 2017-07-17 16:09:50 -0700 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-18 00:09:50 +0100 |
commit | b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd (patch) | |
tree | 9476fb1bef485d63525035a730c459f441635e10 /pkgs/applications/misc/keepassx | |
parent | cc8e2aec299a002ede108dea1c33b1161f1aa180 (diff) | |
download | nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.tar nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.tar.gz nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.tar.bz2 nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.tar.lz nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.tar.xz nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.tar.zst nixpkgs-b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd.zip |
Add cmakeFlags for auto-type and yubikey (#27321)
* Add cmakeFlags for auto-type and yubikey * Add libyubikey dependency * Add auto-type dependencies * Add new dependencies to buildInputs * Fix duplication and capitalization in dependencies * Add yubikey-personalization to dependency and build * Add release build flag * Revert "Add release build flag" This reverts commit afabd63db0ad68348909c67b488787501b7991bb.
Diffstat (limited to 'pkgs/applications/misc/keepassx')
-rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b88291194eb..6ae86486b47 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, - cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales + cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras , withKeePassHTTP ? true }: @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc"; }; - cmakeFlags = [ "-DWITH_GUI_TESTS=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); + cmakeFlags = [ + "-DWITH_GUI_TESTS=ON" + "-DWITH_XC_AUTOTYPE=ON" + "-DWITH_XC_YUBIKEY=ON" + ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); doCheck = true; checkPhase = '' @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { make test ARGS+="-E testgui --output-on-failure" ''; - buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales ]; + buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; meta = { description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; |