tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #86421 from risicle/ris-git-tcltk-darwin-r20.03

[r20.03] git: use tcl/tk from nixpkgs on darwin

authored by

Wout Mertens and committed by
GitHub 788f02c4 8258818a

+9 -1
unified split
+9 -1
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 95 95 ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] 96 96 ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) 97 97 ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] 98 - ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"; 98 + ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1" 99 + # git-gui refuses to start with the version of tk distributed with 100 + # macOS Catalina. We can prevent git from building the .app bundle 101 + # by specifying an invalid tk framework. The postInstall step will 102 + # then ensure that git-gui uses tcl/tk from nixpkgs, which is an 103 + # acceptable version. 104 + # 105 + # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 106 + ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; 99 107 100 108 101 109 postBuild = ''