Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cmakeFlags for auto-type and yubikey #27321

Merged
merged 9 commits into from Jul 17, 2017
Merged

Add cmakeFlags for auto-type and yubikey #27321

merged 9 commits into from Jul 17, 2017

Conversation

billksun
Copy link
Contributor

@billksun billksun commented Jul 12, 2017

This is my first pull request, and I'm not a C/C++ developer at all, so I may need some guidance.

Motivation for this change
  1. Auto-type feature was no longer present. A look in the KeepassXC wiki shows that it's now a separate cmake flag.
  2. Enable YubiKey support introduced in KeepassXC 2.2.0.
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@sib-null, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Drakonis, @Mic92 and @s1lvester to be potential reviewers.

cmakeFlags = [
"-DWITH_GUI_TESTS=ON"
"-DWITH_XC_AUTOTYPE=ON"
"-DWITH_XC_YUBIKEY=ON"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -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, libxi, libxtst, qtx11extras
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They also need to be passed to buildInputs. libxi is called libXi in nixpkgs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Mic92, thanks for your patience with me. Finally got the LInux build building, but looks like there's some problems with the Mac build, any ideas?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the os x failure was unrelated, keepassx-community is not targeted at this platform.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to keepassxc's wiki, they do have build instructions for mac, though I'm not sure how to add platform specific flags.

Regardless, after I added the release build flag and pushed again, the macOS X build passed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is still unrelated, keepassx is not build on os x at the moment:

see:

 platforms = with stdenv.lib.platforms; linux;

@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
"-DWITH_GUI_TESTS=ON"
"-DWITH_XC_AUTOTYPE=ON"
"-DWITH_XC_YUBIKEY=ON"
"-DCMAKE_BUILD_TYPE=Release"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This flag is already added by default.

@Mic92 Mic92 merged commit b4387e7 into NixOS:master Jul 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants