diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-12-12 18:10:26 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-12-12 18:10:26 +0000 |
| commit | 362f811a7aeb9296017519c977a5afd774258c94 (patch) | |
| tree | 9744e13200fcb8b050254333142c8b3a77c1e9ff /pkgs/applications | |
| parent | f63059dd0517bd144f9f8c4a84c6181540d8c459 (diff) | |
| download | nixlib-362f811a7aeb9296017519c977a5afd774258c94.tar nixlib-362f811a7aeb9296017519c977a5afd774258c94.tar.gz nixlib-362f811a7aeb9296017519c977a5afd774258c94.tar.bz2 nixlib-362f811a7aeb9296017519c977a5afd774258c94.tar.lz nixlib-362f811a7aeb9296017519c977a5afd774258c94.tar.xz nixlib-362f811a7aeb9296017519c977a5afd774258c94.tar.zst nixlib-362f811a7aeb9296017519c977a5afd774258c94.zip | |
Revert "git: allow applying patches by config"
This reverts commit rev 18897 I should have used overrideDerivation. svn path=/nixpkgs/trunk/; revision=18911
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b6197b478f26..1f5e78bca130 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,7 +15,6 @@ rec { svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support guiSupport = getConfig ["git" "guiSupport"] false; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; - additionalPatches = getConfig ["git" "additionalPatches"] []; }; gitGit = import ./git/git-git.nix { 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 b3dff45f362e..3f5b15fa218b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -3,7 +3,6 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs , guiSupport -, additionalPatches ? [] }: # `git-svn' support requires Subversion and various Perl libraries. @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3"; }; - patches = [ ./docbook2texi.patch ] ++ additionalPatches; + patches = [ ./docbook2texi.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools |