diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2013-03-14 14:57:40 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2013-03-14 14:57:40 +0100 |
| commit | 23c78e41db9bbc2871d72412d6316009598da5fd (patch) | |
| tree | e5ead70f772e3ae644f45047f5287ea3f01a08ee /pkgs/applications/version-management | |
| parent | 46196750114d85bcd28ff3a91b559b58767c6a53 (diff) | |
| download | nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.tar nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.tar.gz nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.tar.bz2 nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.tar.lz nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.tar.xz nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.tar.zst nixlib-23c78e41db9bbc2871d72412d6316009598da5fd.zip | |
git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 2 |
1 files changed, 1 insertions, 1 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 e96f31c0690c..9aeea223ba7c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals guiSupport [tcl tk]; # required to support pthread_cancel() - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-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"); |