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

git: Fix the "notSupported" scripts for "git send-email" and "git gui"

Browse Source
This commit is contained in:
Eelco Dolstra 2012-06-21 15:23:40 -04:00
parent 9365981409
commit 94812c9dd3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ rec {
gitFull = appendToName "full" (git.override { gitFull = appendToName "full" (git.override {
svnSupport = true; svnSupport = true;
guiSupport = true; guiSupport = true;
sendEmailSupport = stdenv.isDarwin == false; sendEmailSupport = !stdenv.isDarwin;
}); });
gitAnnex = lib.makeOverridable (import ./git-annex) { gitAnnex = lib.makeOverridable (import ./git-annex) {

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

@ -40,7 +40,7 @@ stdenv.mkDerivation {
postInstall = postInstall =
'' ''
notSupported(){ notSupported() {
echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1" echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1"
chmod +x $1 chmod +x $1
} }
@ -72,11 +72,11 @@ stdenv.mkDerivation {
for i in ${builtins.toString perlLibs} ${svn}; do for i in ${builtins.toString perlLibs} ${svn}; do
gitperllib=$gitperllib:$i/lib/perl5/site_perl gitperllib=$gitperllib:$i/lib/perl5/site_perl
done done
wrapProgram "$out/libexec/git-core/git-svn" \ wrapProgram $out/libexec/git-core/git-svn \
--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/bin/git-svn "reinstall with config git = { svnSupport = true } set" notSupported $out/libexec/git-core/git-svn "reinstall with config git = { svnSupport = true } set"
'') '')
+ (if sendEmailSupport then + (if sendEmailSupport then
@ -85,10 +85,10 @@ stdenv.mkDerivation {
for i in ${builtins.toString smtpPerlLibs}; do for i in ${builtins.toString smtpPerlLibs}; do
gitperllib=$gitperllib:$i/lib/perl5/site_perl gitperllib=$gitperllib:$i/lib/perl5/site_perl
done done
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/bin/git-send-email "reinstall with config git = { sendEmailSupport = true } set" notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
'') '')
+ ''# Install man pages and Info manual + ''# Install man pages and Info manual