diff options
author | Shea Levy <shea@shealevy.com> | 2014-04-05 18:39:53 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-04-05 18:39:53 -0400 |
commit | a68c12d35b64bf4b97e772860967af1ea085cdf4 (patch) | |
tree | 073a86362ba3911a32e71e6434dbc4be0590e182 /pkgs/applications/version-management/git-and-tools | |
parent | 923372335321e996b0088ca6aa43ab43fbf3729b (diff) | |
download | nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.tar nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.tar.gz nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.tar.bz2 nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.tar.lz nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.tar.xz nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.tar.zst nixlib-a68c12d35b64bf4b97e772860967af1ea085cdf4.zip |
git: Remove phony not-supported wrappers.
Fixes #1751
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 10 |
1 files changed, 4 insertions, 6 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 9be32b9accdf..9eaa7d219b0b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -47,8 +47,7 @@ stdenv.mkDerivation { postInstall = '' notSupported() { - echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1" - chmod +x $1 + unlink $1 || true } # Install git-subtree. @@ -94,7 +93,7 @@ stdenv.mkDerivation { --set GITPERLLIB "$gitperllib" \ --prefix PATH : "${svn}/bin" '' else '' # replace git-svn by notification script - notSupported $out/libexec/git-core/git-svn "reinstall with config git = { svnSupport = true } set" + notSupported $out/libexec/git-core/git-svn '') + (if sendEmailSupport then @@ -106,7 +105,7 @@ stdenv.mkDerivation { wrapProgram $out/libexec/git-core/git-send-email \ --set GITPERLLIB "$gitperllib" '' else '' # replace git-send-email by notification script - notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set" + notSupported $out/libexec/git-core/git-send-email '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual @@ -123,8 +122,7 @@ stdenv.mkDerivation { '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts for prog in bin/gitk libexec/git-core/git-gui; do - notSupported "$out/$prog" \ - "reinstall with config git = { guiSupport = true; } set" + notSupported "$out/$prog" done ''); |