From 8f3134e5408ea1ea6207028ae17f2b5fb84e0c65 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Dec 2017 16:08:31 -0400 Subject: finally really add back custom-setup stanza Fourth or fifth try at this and finally found a way to make it work. Absurd amount of busy-work forced on me by change in cabal's behavior. Split up Utility modules that need posix stuff out of ones used by Setup. Various other hacks around inability for Setup to use anything that ifdefs a use of unix. Probably lost a full day of my life to this. This is how build systems make their users hate them. Just saying. --- Build/Configure.hs | 11 ++++++----- Build/DesktopFile.hs | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'Build') diff --git a/Build/Configure.hs b/Build/Configure.hs index b40ca9250..a0ddf4dbd 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -4,22 +4,23 @@ module Build.Configure where -import Control.Applicative -import Control.Monad.IfElse -import Control.Monad - import Build.TestConfig import Build.Version import Utility.PartialPrelude import Utility.Process import Utility.SafeCommand import Utility.ExternalSHA -import Utility.Env +import Utility.Env.Basic import Utility.Exception import qualified Git.Version import Utility.DottedVersion import Utility.Directory +import Control.Monad.IfElse +import Control.Monad +import Control.Applicative +import Prelude + tests :: [TestCase] tests = [ TestCase "version" (Config "packageversion" . StringConfig <$> getVersion) diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs index 0203c02a6..a54f45d33 100644 --- a/Build/DesktopFile.hs +++ b/Build/DesktopFile.hs @@ -22,9 +22,7 @@ import Assistant.Install.AutoStart import Assistant.Install.Menu import System.Environment -#ifndef mingw32_HOST_OS -import System.Posix.User -#endif +import System.PosixCompat.User import Data.Maybe import Control.Applicative import Prelude -- cgit v1.2.3