Commit 7626a991 authored by Nikola Knezevic's avatar Nikola Knezevic
Browse files

git: remove outdated patch for darwin 

This patch does not apply cleanly anymore, as the upstream fixed the
issue.

Closes #384758.
parent e3c232ad

pkgs/applications/version-management/git/default.nix

+0 −9
Original line number Diff line number Diff line
@@ -60,15 +60,6 @@ stdenv.mkDerivation (finalAttrs: { 
    ./installCheck-path.patch

  ] ++ lib.optionals withSsh [

    ./ssh-path.patch

  ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isDarwin) [

    # Needed to workaround an issue in macOS where gitk shows a empty window

    # https://github.com/Homebrew/homebrew-core/issues/68798

    # https://github.com/git/git/pull/944

    (fetchpatch {

      name = "gitk_check_main_window_visibility_before_waiting_for_it_to_show.patch";

      url = "https://github.com/git/git/commit/1db62e44b7ec93b6654271ef34065b31496cd02e.patch";

      hash = "sha256-ntvnrYFFsJ1Ebzc6vM9/AMFLHMS1THts73PIOG5DkQo=";

    })

  ];



  postPatch = ''