diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-09-26 23:33:05 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-09-26 23:33:05 +0000 |
| commit | c6419351909f33a50f615b9fe5df42b8daae18b9 (patch) | |
| tree | 1b42645fc5ec1e359d0c743a7b7e24318d4f0f0b /pkgs/applications | |
| parent | 13f467fc842b0e0f0abed77aa63ad2e565c2c61c (diff) | |
| download | nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.tar nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.tar.gz nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.tar.bz2 nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.tar.lz nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.tar.xz nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.tar.zst nixlib-c6419351909f33a50f615b9fe5df42b8daae18b9.zip | |
optionally apply git glob patch to default git
svn path=/nixpkgs/trunk/; revision=17456
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 | 8 |
2 files changed, 8 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 e27d17e5ee91..bdbd6b4ebe78 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 { cpio tcl tk makeWrapper subversion; svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support guiSupport = getConfig ["git" "guiSupport"] false; + gitkGlobSupport = getConfig ["git" "gitkGlobSupport"] false; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; }; 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 a93e9b006a97..6a2393f39497 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 +, gitkGlobSupport }: # `git-svn' support requires Subversion and various Perl libraries. @@ -16,7 +17,12 @@ stdenv.mkDerivation rec { sha256 = "fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a"; }; - patches = [ ./docbook2texi.patch ]; + patches = [ ./docbook2texi.patch ] + ++ # adds possibility to highlight all changes to files matching a glob pattern + stdenv.lib.optional (guiSupport && gitkGlobSupport) (fetchurl { + url = "http://mawercer.de/~marc/git-jrnieder.patch"; + sha256 = "187wf8chdjifwh3rrdc80nkak08jk7n74xq1bfzr2bhx2wicrv0x"; + }); buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools |