diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-03-02 21:57:39 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-03-02 22:29:47 +0900 |
| commit | bc4264a95f632f6a622ee6d69ea72e97cc10fedf (patch) | |
| tree | f3d7c688123767b6c2f66693f95558ffd556f96d /pkgs/applications/version-management/git-and-tools | |
| parent | 880ce71f6760e6b112b57c553233deb403f8da47 (diff) | |
| download | nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.tar nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.tar.gz nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.tar.bz2 nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.tar.lz nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.tar.xz nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.tar.zst nixlib-bc4264a95f632f6a622ee6d69ea72e97cc10fedf.zip | |
git: use tcl/tk from nixpkgs on darwin
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 10 |
1 files changed, 9 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 63f1c0fb9a97..02df27e745f4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -95,7 +95,15 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] - ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"; + ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1" + # git-gui refuses to start with the version of tk distributed with + # macOS Catalina. We can prevent git from building the .app bundle + # by specifying an invalid tk framework. The postInstall step will + # then ensure that git-gui uses tcl/tk from nixpkgs, which is an + # acceptable version. + # + # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 + ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; postBuild = '' |