diff options
| author | Peter Simons <simons@cryp.to> | 2013-03-09 23:57:57 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-03-09 23:57:57 +0100 |
| commit | 4c9ebb62d46b1d803297b8b94a96b291f3f4265d (patch) | |
| tree | 479db35aafab79db67c3f915bd053533f2efa14d /pkgs/applications/version-management/git-and-tools | |
| parent | b8339a1c1d6b973d9feb37c90cae157745d2804d (diff) | |
| download | nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.tar nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.tar.gz nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.tar.bz2 nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.tar.lz nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.tar.xz nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.tar.zst nixlib-4c9ebb62d46b1d803297b8b94a96b291f3f4265d.zip | |
git: link binaries with libgcc_s.so to ensure pthread_cancel() works
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
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 2f293c317d38..e96f31c0690c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { docbook_xsl docbook_xml_dtd_45 libxslt ] ++ 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} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1"); |