From 60cc518b22ed6ebb6e37a507c7c430e42bce2cec Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 20 Aug 2018 21:05:28 -0400
Subject: xmonad: update nix patch

Regenerated against the current release.
---
 .../haskell-modules/patches/xmonad-nix.patch       | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'pkgs/development/haskell-modules')

diff --git a/pkgs/development/haskell-modules/patches/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
index 2a9ec4bfedf..cce011347f4 100644
--- a/pkgs/development/haskell-modules/patches/xmonad-nix.patch
+++ b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
@@ -1,8 +1,8 @@
 diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
-index 138d735..65b5a84 100644
+index 7810522..3262934 100644
 --- a/src/XMonad/Core.hs
 +++ b/src/XMonad/Core.hs
-@@ -51,6 +51,7 @@ import System.Posix.Types (ProcessID)
+@@ -53,6 +53,7 @@ import System.Posix.Types (ProcessID)
  import System.Process
  import System.Directory
  import System.Exit
@@ -10,7 +10,7 @@ index 138d735..65b5a84 100644
  import Graphics.X11.Xlib
  import Graphics.X11.Xlib.Extras (getWindowAttributes, WindowAttributes, Event)
  import Data.Typeable
-@@ -571,6 +572,7 @@ recompile force = io $ do
+@@ -601,6 +602,7 @@ recompile force = io $ do
          lib  = cfgdir </> "lib"
          buildscript = cfgdir </> "build"
  
@@ -18,7 +18,7 @@ index 138d735..65b5a84 100644
      libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib
      srcT <- getModTime src
      binT <- getModTime bin
-@@ -586,7 +588,7 @@ recompile force = io $ do
+@@ -643,7 +645,7 @@ recompile force = io $ do
          status <- bracket (openFile err WriteMode) hClose $ \errHandle ->
              waitForProcess =<< if useBuildscript
                                 then compileScript bin cfgdir buildscript errHandle
@@ -27,24 +27,24 @@ index 138d735..65b5a84 100644
  
          -- re-enable SIGCHLD:
          installSignalHandlers
-@@ -594,6 +596,7 @@ recompile force = io $ do
-         -- now, if it fails, run xmessage to let the user know:
-         when (status /= ExitSuccess) $ do
-             ghcErr <- readFile err
-+            xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
-             let msg = unlines $
-                     ["Error detected while loading xmonad configuration file: " ++ src]
-                     ++ lines (if null ghcErr then show status else ghcErr)
-@@ -601,7 +604,7 @@ recompile force = io $ do
-             -- nb, the ordering of printing, then forking, is crucial due to
-             -- lazy evaluation
-             hPutStrLn stderr msg
--            forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing
-+            forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing
-             return ()
+@@ -653,6 +655,7 @@ recompile force = io $ do
+             then trace "XMonad recompilation process exited with success!"
+             else do
+                 ghcErr <- readFile err
++                xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
+                 let msg = unlines $
+                         ["Error detected while loading xmonad configuration file: " ++ src]
+                         ++ lines (if null ghcErr then show status else ghcErr)
+@@ -660,7 +663,7 @@ recompile force = io $ do
+                 -- nb, the ordering of printing, then forking, is crucial due to
+                 -- lazy evaluation
+                 hPutStrLn stderr msg
+-                forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing
++                forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing
+                 return ()
          return (status == ExitSuccess)
        else return True
-@@ -619,16 +622,16 @@ recompile force = io $ do
+@@ -678,16 +681,16 @@ recompile force = io $ do
             '\8216' -> '`'  -- ‘
             '\8217' -> '`'  -- ’
             _ -> c
-- 
cgit 1.4.1