public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "git-credential-osxkeychain"

Browse Source 
This reverts commit 58fa09a40a287c891328ce7b4864cc911b96d21a.
This commit is contained in:
Jude Taylor 2015-09-18 10:20:26 -07:00
parent 27678026d7
commit 8b54192b85
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -9,7 +9,6 @@ let
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
tk makeWrapper subversionClient gzip libiconv; tk makeWrapper subversionClient gzip libiconv;
inherit (darwin.apple_sdk.frameworks) Security;
texinfo = texinfo5; texinfo = texinfo5;
svnSupport = false; # for git-svn support svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk guiSupport = false; # requires tcl/tk

23
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , 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 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport , guiSupport
, withManual ? true , withManual ? true
@ -28,19 +28,10 @@ stdenv.mkDerivation {
./ssl-cert-file.patch ./ssl-cert-file.patch
]; ];
__impureHostDeps = [
"/System/Library/Frameworks/Security.framework/Versions/A/Security"
];
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ] docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk] ++ stdenv.lib.optionals guiSupport [tcl tk];
++ stdenv.lib.optional stdenv.isDarwin [ Security ];
postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
make -C contrib/credential/osxkeychain
'';
# required to support pthread_cancel() # required to support pthread_cancel()
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
@ -64,14 +55,12 @@ stdenv.mkDerivation {
} }
# Install git-subtree. # 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 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. # Install contrib stuff.
mkdir -p $out/share/git mkdir -p $out/share/git
mv contrib $out/share/git/ mv contrib $out/share/git/