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

keepassxc: fix darwin build #76919

Merged
merged 1 commit into from Jan 8, 2020
Merged

Conversation

squalus
Copy link
Member

@squalus squalus commented Jan 4, 2020

Motivation for this change

This PR allows keepassxc to build on macOS.

  • Removed the unnecessary libmicrohttpd dependency, which doesn't build on macOS. KeepassXC removed this dependency in 2.1.2.
  • Fixed a compiler error related to the Touch ID feature by adding a dependency on the LocalAuthentication framework. Compiler error that was fixed:
[ 64%] Building CXX object src/CMakeFiles/keepassx_core.dir/keys/drivers/YubiKey.cpp.o
[ 64%] Building CXX object src/CMakeFiles/keepassx_core.dir/touchid/TouchID.mm.o
/private/var/folders/qx/jwzr4j413sj76yplz7xqx22h0000gn/T/nix-build-keepassxc-2.5.1.drv-0/source/src/touchid/TouchID.mm:11:10: fatal error: 'LocalAuthentication/LocalAuthentication.h' file not found
#include <LocalAuthentication/LocalAuthentication.h>
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
make[2]: *** [src/CMakeFiles/keepassx_core.dir/build.make:2065: src/CMakeFiles/keepassx_core.dir/touchid/TouchID.mm.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:641: src/CMakeFiles/keepassx_core.dir/all] Error 2
make: *** [Makefile:163: all] Error 2
builder for '/nix/store/a7wrkjifshgxjls99gj344yvi3rwvfzm-keepassxc-2.5.1.drv' failed with exit code 2
error: build of '/nix/store/a7wrkjifshgxjls99gj344yvi3rwvfzm-keepassxc-2.5.1.drv' failed
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @jonafato

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 4, 2020
@ofborg ofborg bot requested a review from jonafato January 4, 2020 02:32
@bjornfor
Copy link
Contributor

bjornfor commented Jan 7, 2020

Please include the very useful info in the PR message in the commit message.

- Removed the unnecessary libmicrohttpd dependency, which doesn't
  build on macOS. KeepassXC removed this dependency in 2.1.2
- Fixed a compiler error related to the Touch ID feature by adding a
  dependency on the LocalAuthentication framework
@squalus
Copy link
Member Author

squalus commented Jan 8, 2020

Added some more info to the commit message

@bjornfor bjornfor merged commit 9314327 into NixOS:master Jan 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants