From 8b54192b85eb8b28fdcb0badbedd1bfca57e139e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 18 Sep 2015 10:20:26 -0700
Subject: [PATCH] Revert "git-credential-osxkeychain"

This reverts commit 58fa09a40a287c891328ce7b4864cc911b96d21a.
---
 .../git-and-tools/default.nix                 |  1 -
 .../git-and-tools/git/default.nix             | 23 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index fe9d05ece80a..adf8027bf27d 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -9,7 +9,6 @@ let
     inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
       asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
       tk makeWrapper subversionClient gzip libiconv;
-    inherit (darwin.apple_sdk.frameworks) Security;
     texinfo = texinfo5;
     svnSupport = false;		# for git-svn support
     guiSupport = false;		# requires tcl/tk
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 b4f00bc310b2..2c29ce82de56 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
-, libxslt, tcl, tk, makeWrapper, libiconv, Security
+, libxslt, tcl, tk, makeWrapper, libiconv
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
 , guiSupport
 , withManual ? true
@@ -28,19 +28,10 @@ stdenv.mkDerivation {
     ./ssl-cert-file.patch
   ];
 
-  __impureHostDeps = [
-    "/System/Library/Frameworks/Security.framework/Versions/A/Security"
-  ];
-
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
          docbook_xsl docbook_xml_dtd_45 libxslt ]
-    ++ stdenv.lib.optionals guiSupport [tcl tk]
-    ++ stdenv.lib.optional stdenv.isDarwin [ Security ];
-
-  postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
-    make -C contrib/credential/osxkeychain
-  '';
+    ++ stdenv.lib.optionals guiSupport [tcl tk];
 
   # required to support pthread_cancel()
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
@@ -64,14 +55,12 @@ stdenv.mkDerivation {
       }
 
       # Install git-subtree.
-      make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"}
+      pushd contrib/subtree
+      make
+      make install ${stdenv.lib.optionalString withManual "install-doc"}
+      popd
       rm -rf contrib/subtree
 
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-      install -m 755 contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core
-      rm -rf contrib/credential/osxkeychain
-
-    '' + ''
       # Install contrib stuff.
       mkdir -p $out/share/git
       mv contrib $out/share/git/