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

keepassxc: fix darwin build #76919

merged 1 commit into from Jan 8, 2020

Conversation

@squalus
Copy link
Contributor

@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

@bjornfor
Copy link
Contributor

@bjornfor 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 squalus force-pushed the squalus:keepassxc-darwin branch from ecefd2c to 4ea2163 Jan 8, 2020
@squalus
Copy link
Contributor Author

@squalus squalus commented Jan 8, 2020

Added some more info to the commit message

@bjornfor bjornfor merged commit 9314327 into NixOS:master Jan 8, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
keepassxc on aarch64-linux Success
Details
keepassxc on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.