git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
eaef571Sandro
pkgs/applications/version-management/git-and-tools/git/default.nix+1−1
compare with master
unifiedsplit
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
78 ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
78 ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
79
79
80 # required to support pthread_cancel()
80 # required to support pthread_cancel()
81− NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
81+ NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
82 + lib.optionalString (stdenv.isFreeBSD) "-lthr";
82 + lib.optionalString (stdenv.isFreeBSD) "-lthr";
83
83
84 configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
84 configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [