Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ccce14ed53aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9314327deef0
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 8, 2020

  1. keepassxc: fix darwin build 

    - 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
    @bjornfor
    squalus authored and bjornfor committed Jan 8, 2020
    Copy the full SHA
    9314327 View commit details
Showing with 5 additions and 5 deletions.
  1. +4 −5 pkgs/applications/misc/keepassx/community.nix
  2. +1 −0 pkgs/os-specific/darwin/apple-sdk/frameworks.nix
9 changes: 4 additions & 5 deletions pkgs/applications/misc/keepassx/community.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin

, curl
, glibcLocales
@@ -7,7 +7,6 @@
, libargon2
, libgcrypt
, libgpgerror
, libmicrohttpd
, libsodium
, libyubikey
, pkg-config
@@ -93,7 +92,6 @@ stdenv.mkDerivation rec {
libargon2
libgcrypt
libgpgerror
libmicrohttpd
libsodium
libyubikey
pkg-config
@@ -105,7 +103,8 @@ stdenv.mkDerivation rec {
zlib
]
++ stdenv.lib.optional withKeePassKeeShareSecure quazip
++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
++ stdenv.lib.optional stdenv.isDarwin qtmacextras
++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;

preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH.
@@ -118,6 +117,6 @@ stdenv.mkDerivation rec {
homepage = https://keepassxc.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ jonafato ];
platforms = with platforms; linux ++ darwin;
platforms = platforms.linux ++ platforms.darwin;
};
}
1 change: 1 addition & 0 deletions pkgs/os-specific/darwin/apple-sdk/frameworks.nix
View file
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ with frameworks; with libs; {
Kernel = [ IOKit ];
LDAP = [];
LatentSemanticMapping = [ Carbon ];
LocalAuthentication = [];
MapKit = [];
MediaAccessibility = [ CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ];