Merge pull request #105026 from thefloweringash/apple-silicon
Native support for Apple Silicon
This commit is contained in:
@@ -7,8 +7,15 @@
|
||||
, gnutlsSupport ? false, gnutls ? null
|
||||
, wolfsslSupport ? false, wolfssl ? null
|
||||
, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
|
||||
, # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
|
||||
gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5 ? null
|
||||
, gssSupport ? with stdenv.hostPlatform; !(
|
||||
!isWindows &&
|
||||
# a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
|
||||
!isStatic &&
|
||||
# the "mig" tool does not configure its compiler correctly. This could be
|
||||
# fixed in mig, but losing gss support on cross compilation to darwin is
|
||||
# not worth the effort.
|
||||
!(isDarwin && (stdenv.buildPlatform != stdenv.hostPlatform))
|
||||
), libkrb5 ? null
|
||||
, c-aresSupport ? false, c-ares ? null
|
||||
, brotliSupport ? false, brotli ? null
|
||||
}:
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
, pkg-config
|
||||
, pam
|
||||
, etcDir ? null
|
||||
, withKerberos ? true
|
||||
, withKerberos ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
|
||||
, libkrb5
|
||||
, libfido2
|
||||
, nixosTests
|
||||
|
||||
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||
MACOSX_DEPLOYMENT_TARGET=10.16
|
||||
'';
|
||||
|
||||
configureFlags = lib.optional (!withPython) "--disable-python";
|
||||
|
||||
buildInputs = [ openssl libpcap ]
|
||||
|
||||
Reference in New Issue
Block a user