BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskellPackages.xmonad: Update xmonad-nix.patch

Browse source
This commit is contained in:
Franz Pletz 2015-12-22 18:02:15 +01:00
parent e0d6e79f6c
commit eb7a441179
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/haskell-modules/patches/xmonad-nix.patch
View file

@ -1,6 +1,6 @@
--- xmonad-0.11/XMonad/Core.hs 2013-01-01 01:31:47.000000000 +0000 --- a/src/XMonad/Core.hs
+++ new-xmonad/XMonad/Core.hs 2013-12-23 17:36:40.862146910 +0000 +++ b/src/XMonad/Core.hs
@@ -47,6 +47,7 @@ @@ -48,6 +48,7 @@ import System.Posix.Types (ProcessID)
import System.Process import System.Process
import System.Directory import System.Directory
import System.Exit import System.Exit
@ -8,7 +8,7 @@
import Graphics.X11.Xlib import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras (Event) import Graphics.X11.Xlib.Extras (Event)
import Data.Typeable import Data.Typeable
@@ -452,6 +453,7 @@ @@ -463,6 +464,7 @@ recompile force = io $ do
err = base ++ ".errors" err = base ++ ".errors"
src = base ++ ".hs" src = base ++ ".hs"
lib = dir </> "lib" lib = dir </> "lib"
@ -16,16 +16,16 @@
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
@@ -460,7 +462,7 @@ @@ -471,7 +473,7 @@ recompile force = io $ do
-- temporarily disable SIGCHLD ignoring: -- temporarily disable SIGCHLD ignoring:
uninstallSignalHandlers uninstallSignalHandlers
status <- bracket (openFile err WriteMode) hClose $ \h -> status <- bracket (openFile err WriteMode) hClose $ \h ->
- waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir) - waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-main-is", "main", "-v0", "-o",binn] (Just dir)
+ waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir) + waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-main-is", "main", "-v0", "-o",binn] (Just dir)
Nothing Nothing Nothing (Just h) Nothing Nothing Nothing (Just h)
-- re-enable SIGCHLD: -- re-enable SIGCHLD:
@@ -469,6 +471,7 @@ @@ -480,6 +482,7 @@ recompile force = io $ do
-- now, if it fails, run xmessage to let the user know: -- now, if it fails, run xmessage to let the user know:
when (status /= ExitSuccess) $ do when (status /= ExitSuccess) $ do
ghcErr <- readFile err ghcErr <- readFile err
@ -33,7 +33,7 @@
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)
@@ -476,7 +479,7 @@ @@ -487,7 +490,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