JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git: Remove phony not-supported wrappers.

Browse Source 
Fixes #1751
This commit is contained in:
Shea Levy 2014-04-05 18:39:53 -04:00
parent 9233723353
commit a68c12d35b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -47,8 +47,7 @@ stdenv.mkDerivation {
postInstall = postInstall =
'' ''
notSupported() { notSupported() {
echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1" unlink $1 || true
chmod +x $1
} }
# Install git-subtree. # Install git-subtree.
@ -94,7 +93,7 @@ stdenv.mkDerivation {
--set GITPERLLIB "$gitperllib" \ --set GITPERLLIB "$gitperllib" \
--prefix PATH : "${svn}/bin" '' --prefix PATH : "${svn}/bin" ''
else '' # replace git-svn by notification script 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 + (if sendEmailSupport then
@ -106,7 +105,7 @@ stdenv.mkDerivation {
wrapProgram $out/libexec/git-core/git-send-email \ wrapProgram $out/libexec/git-core/git-send-email \
--set GITPERLLIB "$gitperllib" '' --set GITPERLLIB "$gitperllib" ''
else '' # replace git-send-email by notification script 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 + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
@ -123,8 +122,7 @@ stdenv.mkDerivation {
'' else '' '' else ''
# Don't wrap Tcl/Tk, replace them by notification scripts # Don't wrap Tcl/Tk, replace them by notification scripts
for prog in bin/gitk libexec/git-core/git-gui; do for prog in bin/gitk libexec/git-core/git-gui; do
notSupported "$out/$prog" \ notSupported "$out/$prog"
"reinstall with config git = { guiSupport = true; } set"
done done
''); '');