summaryrefslogtreecommitdiff
path: root/src/Utility/UserInfo.hs
diff options
context:
space:
mode:
authorJoey Hess2016-05-22 15:55:27 -0400
committerJoey Hess2016-05-22 15:55:27 -0400
commitb5f9026a89602a441e717a167c3d753346172885 (patch)
treeda635a9ea77155dfcf150b13b88db044bf479c78 /src/Utility/UserInfo.hs
parent65ac730c006184472a7d0cb19deffdd69839530f (diff)
parent0dd63693b8938a1d9a1319811b3d8bdd1569c60f (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Utility/UserInfo.hs')
-rw-r--r--src/Utility/UserInfo.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Utility/UserInfo.hs b/src/Utility/UserInfo.hs
index 7e94cafa..c6010116 100644
--- a/src/Utility/UserInfo.hs
+++ b/src/Utility/UserInfo.hs
@@ -17,9 +17,7 @@ module Utility.UserInfo (
import Utility.Env
import System.PosixCompat
-#ifndef mingw32_HOST_OS
import Control.Applicative
-#endif
import Prelude
{- Current user's home directory.
@@ -58,6 +56,6 @@ myVal envvars extract = go envvars
#ifndef mingw32_HOST_OS
go [] = extract <$> (getUserEntryForID =<< getEffectiveUserID)
#else
- go [] = error $ "environment not set: " ++ show envvars
+ go [] = extract <$> error ("environment not set: " ++ show envvars)
#endif
go (v:vs) = maybe (go vs) return =<< getEnv v