From cfe42425c3f2208e3a075a21a4bbee5a2949f4af Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 14 Apr 2014 14:53:15 -0500 Subject: [PATCH] On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds --- .../version-management/git-and-tools/git/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 649b0a7e4a2..a7be9b5798a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation { makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") - + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else ""); + + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else ""); + # FIXME: "make check" requires Sparse; the Makefile must be tweaked # so that `SPARSE_FLAGS' corresponds to the current architecture...