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

Revert "git: allow applying patches by config"

Browse Source 
This reverts commit rev 18897
I should have used overrideDerivation.

svn path=/nixpkgs/trunk/; revision=18911
This commit is contained in:
Marc Weber 2009-12-12 18:10:26 +00:00
parent f63059dd05
commit 362f811a7a
2 changed files with 1 additions and 3 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

@ -15,7 +15,6 @@ rec {
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
guiSupport = getConfig ["git" "guiSupport"] false; guiSupport = getConfig ["git" "guiSupport"] false;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
additionalPatches = getConfig ["git" "additionalPatches"] [];
}; };
gitGit = import ./git/git-git.nix { gitGit = import ./git/git-git.nix {

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

@ -3,7 +3,6 @@
, libxslt, tcl, tk, makeWrapper , libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs , svnSupport, subversion, perlLibs
, guiSupport , guiSupport
, additionalPatches ? []
}: }:
# `git-svn' support requires Subversion and various Perl libraries. # `git-svn' support requires Subversion and various Perl libraries.
@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3"; sha256 = "4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3";
}; };
patches = [ ./docbook2texi.patch ] ++ additionalPatches; patches = [ ./docbook2texi.patch ];
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ # documentation tools ++ # documentation tools