Removed bundled gpg from the Linux standalone build and OSX dmg
Because gpg now always wants to use gpg-agent, and shipping such a daemon in those is not a good idea.
This commit is contained in:
parent
c96e623343
commit
258e8f8f29
4 changed files with 35 additions and 8 deletions
|
@ -24,14 +24,6 @@ bundledPrograms = preferredBundledPrograms ++ extraBundledPrograms
|
|||
-}
|
||||
extraBundledPrograms :: [FilePath]
|
||||
extraBundledPrograms = catMaybes
|
||||
-- The system gpg is probably better, because it may better
|
||||
-- integrate with the system gpg-agent, etc.
|
||||
-- On Windows, gpg is bundled with git for windows.
|
||||
#ifndef mingw32_HOST_OS
|
||||
[ BuildInfo.gpg
|
||||
#else
|
||||
[
|
||||
#endif
|
||||
#ifndef darwin_HOST_OS
|
||||
#ifndef mingw32_HOST_OS
|
||||
-- OS X has ssh installed by default.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue