Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8258818a5207
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 788f02c4aabc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 3, 2020

  1. git: use tcl/tk from nixpkgs on darwin 

    (cherry picked from commit bc4264a)
    @thefloweringash @risicle
    thefloweringash authored and risicle committed May 3, 2020

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: B2D065AD4D6E0C81
    Expired
    Learn about vigilant mode
    Copy the full SHA
    f98c32e View commit details

Commits on May 6, 2020

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

    [r20.03] git: use tcl/tk from nixpkgs on darwin
    @wmertens
    wmertens authored May 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    788f02c View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/applications/version-management/git-and-tools/git/default.nix
10 changes: 9 additions & 1 deletion pkgs/applications/version-management/git-and-tools/git/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''