diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
| commit | 3a0bd261d9cfd395ed23ff43515523e6c6658c33 (patch) | |
| tree | 9186c5daf386ba8e76c47ec869a737344a5a74d1 /Utility/Gpg.hs | |
| parent | ac4b4a812da85b46e7d656b12d9ff5568ef706fd (diff) | |
fold Build/SysConfig.hs into BuildInfo via include
This avoids warnings from stack about the module not being listed in the
cabal file. So, the generated file is also renamed to Build/SysConfig.
Note that the setup program seems to be cached despite these changes; I
had to cabal clean to get cabal to update it so that Build/SysConfig was
written.
This commit was sponsored by Jochen Bartl on Patreon.
Diffstat (limited to 'Utility/Gpg.hs')
| -rw-r--r-- | Utility/Gpg.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index 2ffb0add6..4af0067bb 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -10,7 +10,7 @@ module Utility.Gpg where import Common -import qualified Build.SysConfig as SysConfig +import qualified BuildInfo #ifndef mingw32_HOST_OS import System.Posix.Types import qualified System.Posix.IO @@ -35,7 +35,7 @@ newtype GpgCmd = GpgCmd { unGpgCmd :: String } - command was found at configure time, use it, or otherwise, "gpg". -} mkGpgCmd :: Maybe FilePath -> GpgCmd mkGpgCmd (Just c) = GpgCmd c -mkGpgCmd Nothing = GpgCmd (fromMaybe "gpg" SysConfig.gpg) +mkGpgCmd Nothing = GpgCmd (fromMaybe "gpg" BuildInfo.gpg) boolGpgCmd :: GpgCmd -> [CommandParam] -> IO Bool boolGpgCmd (GpgCmd cmd) = boolSystem cmd |