Fix Windows build

sjakobi · sjakobi · commit 6218dadaf5fd · 2016-07-21T18:29:45.000+02:00
diff --git a/src/Stack/Docker.hs b/src/Stack/Docker.hs
@@ -186,7 +186,7 @@ reexecWithOptionalContainer mprojectRoot =
         exePath <- ensureDockerStackExe dockerContainerPlatform
         cmdArgs args (toFilePath exePath)
     cmdArgs args exePath = do
-        let mountPath = toFilePath hostBinDir FP.</> FP.takeBaseName exePath
+        let mountPath = hostBinDir FP.</> FP.takeBaseName exePath
         return (mountPath, args, [], [Mount exePath mountPath])
 
 -- | If Docker is enabled, re-runs the OS command returned by the second argument in a
@@ -294,8 +294,9 @@ runContainerAndExit getCmdArgs
                          -- This is fixed in Docker 1.9.1, but will leave the workaround
                          -- in place for now, for users who haven't upgraded yet.
                          (isTerm || (isNothing bamboo && isNothing jenkins))
+     hostBinDirPath <- parseAbsDir hostBinDir
      newPathEnv <- augmentPath
-                      [ hostBinDir
+                      [ hostBinDirPath
                       , sandboxHomeDir </> $(mkRelDir ".local/bin")]
                       (T.pack <$> lookupImageEnv "PATH" imageEnvVars)
      (cmnd,args,envVars,extraMount) <- getCmdArgs docker envOverride imageInfo isRemoteDocker
@@ -858,8 +859,8 @@ homeDirName :: Path Rel Dir
 homeDirName = $(mkRelDir "_home/")
 
 -- | Directory where 'stack' executable is bind-mounted in Docker container
-hostBinDir :: Path Abs Dir
-hostBinDir = $(mkAbsDir "/opt/host/bin")
+hostBinDir :: FilePath
+hostBinDir = "/opt/host/bin"
 
 -- | Convenience function to decode ByteString to String.
 decodeUtf8 :: BS.ByteString -> String
