colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xmonad: update nix patch

Browse Source 
Regenerated against the current release.
This commit is contained in:
Michael Alan Dorman 2018-08-20 21:05:28 -04:00 committed by Peter Simons
parent cd35b1cc9c
commit 60cc518b22
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/development/haskell-modules/patches/xmonad-nix.patch
View File

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