summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 12:52:03 -0400
committerJoey Hess2015-01-04 13:08:19 -0400
commit01d8ab0cfd5e65395afc242f8307a67c48ec8544 (patch)
tree7a7247ce30fd0bc7c8f3abad044e8dc0d1494ebd /src
parent8172f243d73f0c7f7231d03c3561c3da5a7ad0d4 (diff)
Fix build with process 1.2.1.0.
Diffstat (limited to 'src')
-rw-r--r--src/Utility/Process.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Utility/Process.hs b/src/Utility/Process.hs
index 3e010541..8fefaa54 100644
--- a/src/Utility/Process.hs
+++ b/src/Utility/Process.hs
@@ -38,7 +38,7 @@ module Utility.Process (
) where
import qualified System.Process
-import System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
+import qualified System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
import System.Process hiding (createProcess, readProcess)
import System.Exit
import System.IO
@@ -47,7 +47,7 @@ import Control.Concurrent
import qualified Control.Exception as E
import Control.Monad
#ifndef mingw32_HOST_OS
-import System.Posix.IO
+import qualified System.Posix.IO
#else
import Control.Applicative
#endif
@@ -175,9 +175,9 @@ processTranscript' cmd opts environ input = do
#ifndef mingw32_HOST_OS
{- This implementation interleves stdout and stderr in exactly the order
- the process writes them. -}
- (readf, writef) <- createPipe
- readh <- fdToHandle readf
- writeh <- fdToHandle writef
+ (readf, writef) <- System.Posix.IO.createPipe
+ readh <- System.Posix.IO.fdToHandle readf
+ writeh <- System.Posix.IO.fdToHandle writef
p@(_, _, _, pid) <- createProcess $
(proc cmd opts)
{ std_in = if isJust input then CreatePipe else Inherit