diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-22 15:55:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-22 15:55:01 +0200 |
| commit | f2aaed44aa4424f332aa359460148ee2bdaaf0ab (patch) | |
| tree | 9bb71df41ab87003aac810c92ec7dd5213ea9e73 /pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch | |
| parent | 6ee8bca8ee983416738720880a566c1203b7d25f (diff) | |
| download | nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.tar nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.tar.gz nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.tar.bz2 nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.tar.lz nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.tar.xz nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.tar.zst nixlib-f2aaed44aa4424f332aa359460148ee2bdaaf0ab.zip | |
git: Properly use symlinks instead of hard links
Git's Makefile has a NO_INSTALL_HARDLINKS flag to produce symlinks instead of hard links. However, it still produces hard links between $out/bin and $out/libexec, hence the patch. Also, update Git to 1.8.2.1.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch new file mode 100644 index 000000000000..29d537db25f9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile +--- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 ++++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 +@@ -2319,8 +2319,7 @@ + { test "$$bindir/" = "$$execdir/" || \ + for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ + $(RM) "$$execdir/$$p" && \ +- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ +- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ ++ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ + cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ + done; \ + } && \ |