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

git: link binaries with libgcc_s.so to ensure pthread_cancel() works

Browse Source
This commit is contained in:
Peter Simons 2013-03-09 23:57:57 +01:00
parent b8339a1c1d
commit 4c9ebb62d4
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,9 @@ stdenv.mkDerivation {
docbook_xsl docbook_xml_dtd_45 libxslt ] docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk]; ++ stdenv.lib.optionals guiSupport [tcl tk];
# required to support pthread_cancel()
NIX_LDFLAGS = "-lgcc_s";
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " makeFlags = "prefix=\${out} 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");