forked from mirrors/nixpkgs
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
|
diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
|
||
|
|
index 46a0939..92af53d 100644
|
||
|
|
--- a/src/XMonad/Core.hs
|
||
|
|
+++ b/src/XMonad/Core.hs
|
||
|
|
@@ -46,6 +46,7 @@ import Data.Traversable (for)
|
||
|
|
import Data.Time.Clock (UTCTime)
|
||
|
|
import Data.Default.Class
|
||
|
|
import Data.List (isInfixOf)
|
||
|
|
+import System.Environment (lookupEnv)
|
||
|
|
import System.FilePath
|
||
|
|
import System.IO
|
||
|
|
import System.Info
|
||
|
|
@@ -458,7 +459,8 @@ xfork x = io . forkProcess . finally nullStdin $ do
|
||
|
|
-- | Use @xmessage@ to show information to the user.
|
||
|
|
xmessage :: MonadIO m => String -> m ()
|
||
|
|
xmessage msg = void . xfork $ do
|
||
|
|
- executeFile "xmessage" True
|
||
|
|
+ xmessageBin <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
|
||
|
|
+ executeFile xmessageBin True
|
||
|
|
[ "-default", "okay"
|
||
|
|
, "-xrm", "*international:true"
|
||
|
|
, "-xrm", "*fontSet:-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-fixed-*-*-*-*-18-*-*-*-*-*-*-*,-*-*-*-*-*-*-18-*-*-*-*-*-*-*"
|
||
|
|
@@ -654,8 +656,9 @@ compile dirs method =
|
||
|
|
bracket (openFile (errFileName dirs) WriteMode) hClose $ \err -> do
|
||
|
|
let run = runProc (cfgDir dirs) err
|
||
|
|
case method of
|
||
|
|
- CompileGhc ->
|
||
|
|
- run "ghc" ghcArgs
|
||
|
|
+ CompileGhc -> do
|
||
|
|
+ ghc <- fromMaybe "ghc" <$> (lookupEnv "NIX_GHC")
|
||
|
|
+ run ghc ghcArgs
|
||
|
|
CompileStackGhc stackYaml ->
|
||
|
|
run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&.
|
||
|
|
run "stack" ("ghc" : "--stack-yaml" : stackYaml : "--" : ghcArgs)
|