diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-17 01:10:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 01:10:00 +0200 |
| commit | eaef571d7615ac6d5543b916db98978ff75e52a3 (patch) | |
| tree | 5be4e8135175db16fe90926bcf08e4d49a18f05b /pkgs/applications/version-management | |
| parent | 8bae808a2152cf0d1e2d2cf3bf591cfcb960686f (diff) | |
| parent | fc1c4bab77a00e831a0c22438b86f3cb910e5712 (diff) | |
| download | nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.tar nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.tar.gz nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.tar.bz2 nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.tar.lz nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.tar.xz nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.tar.zst nixpkgs-eaef571d7615ac6d5543b916db98978ff75e52a3.zip | |
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
git: fix pkgsStatic build
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 8ad150f1306..90505091d29 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.isFreeBSD) "-lthr"; configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ |