diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-22 09:15:54 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-22 09:15:54 -0500 |
| commit | 5f27396e8f6fd53f76638484331599461842f0cf (patch) | |
| tree | 04a55d4f273954426fd9c80f1c5740e4810a056e | |
| parent | 18231121f409057547a6b5c9bd9db13f9ca9b53a (diff) | |
| download | nixlib-5f27396e8f6fd53f76638484331599461842f0cf.tar nixlib-5f27396e8f6fd53f76638484331599461842f0cf.tar.gz nixlib-5f27396e8f6fd53f76638484331599461842f0cf.tar.bz2 nixlib-5f27396e8f6fd53f76638484331599461842f0cf.tar.lz nixlib-5f27396e8f6fd53f76638484331599461842f0cf.tar.xz nixlib-5f27396e8f6fd53f76638484331599461842f0cf.tar.zst nixlib-5f27396e8f6fd53f76638484331599461842f0cf.zip | |
git: remove symlinks-in-bin patch
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch | 13 |
2 files changed, 0 insertions, 14 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 18bb1a2f93dd..875590484f9e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch - ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch ./git-send-email-honor-PATH.patch 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 deleted file mode 100644 index 0a581a61d46d..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -2609,8 +2609,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; \ - } && \ |