diff options
author | Peter Simons <simons@cryp.to> | 2011-07-07 23:48:38 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2011-07-07 23:48:38 +0000 |
commit | e4353b1f65c8dd8b46085bfdfc294b6465da9e4a (patch) | |
tree | 86e9789cac0e20ef4c94072325f172001c2f9a78 /pkgs/applications | |
parent | 2fee0ecef93d94c87d3a8735dc6e6550ccbb2b22 (diff) | |
download | nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.tar nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.tar.gz nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.tar.bz2 nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.tar.lz nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.tar.xz nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.tar.zst nixpkgs-e4353b1f65c8dd8b46085bfdfc294b6465da9e4a.zip |
git: install contrib code included in the distribution
TODO: byte-compile emacs modules svn path=/nixpkgs/trunk/; revision=27665
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
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 8db7151094d..7d51573bad2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -41,16 +41,19 @@ stdenv.mkDerivation rec { chmod +x $1 } - # Install Emacs mode. - echo "installing Emacs mode..." + # Install contrib stuff. + ensureDir $out/share/git + mv contrib $out/share/git/ ensureDir $out/share/emacs/site-lisp - cp -p contrib/emacs/*.el $out/share/emacs/site-lisp + ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ + ensureDir $out/etc/bash_completion.d + ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/ # grep is a runtime dependence, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ --replace ' grep' ' ${gnugrep}/bin/grep' \ --replace ' egrep' ' ${gnugrep}/bin/egrep' - '' # */ + '' + (if svnSupport then @@ -97,10 +100,6 @@ stdenv.mkDerivation rec { done '') - + ''# install bash completion script - d="$out/etc/bash_completion.d" - ensureDir $d; cp contrib/completion/git-completion.bash "$d" - '' # Don't know why hardlinks aren't created. git installs the same executable # multiple times into $out so replace duplicates by symlinks because I # haven't tested whether the nix distribution system can handle hardlinks. @@ -109,6 +108,7 @@ stdenv.mkDerivation rec { declare -A seen shopt -s globstar for f in "$out/"**; do + if [ -L "$f" ]; then continue; fi test -f "$f" || continue sum=$(md5sum "$f"); sum=''\${sum/ */} |