diff options
author | Marc Weber <marco-oweber@gmx.de> | 2009-12-11 13:58:31 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2009-12-11 13:58:31 +0000 |
commit | 0ceae8f6d187d373989095ec0e62325cd6959df9 (patch) | |
tree | 25f18c0cf05495908bdf04825eab5f64822fdf2f /pkgs/applications/version-management | |
parent | 78a1418e6d415c6b3ad8d5f61c2bbc91e44629b4 (diff) |
git: allow applying patches by config
svn path=/nixpkgs/trunk/; revision=18897
Diffstat (limited to 'pkgs/applications/version-management')
-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, 3 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 1f5e78bca130..b6197b478f26 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,6 +15,7 @@ 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 3f5b15fa218b..b3dff45f362e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -3,6 +3,7 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs , guiSupport +, additionalPatches ? [] }: # `git-svn' support requires Subversion and various Perl libraries. @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3"; }; - patches = [ ./docbook2texi.patch ]; + patches = [ ./docbook2texi.patch ] ++ additionalPatches; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools |