JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2262 from jwiegley/git

Browse Source 
On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds
This commit is contained in:
Peter Simons 2014-04-15 10:31:07 +02:00
commit 3275e47613
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -36,7 +36,9 @@ stdenv.mkDerivation {
makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " 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 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 # FIXME: "make check" requires Sparse; the Makefile must be tweaked
# so that `SPARSE_FLAGS' corresponds to the current architecture... # so that `SPARSE_FLAGS' corresponds to the current architecture...