diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2019-08-04 21:14:45 +0200 |
|---|---|---|
| committer | Daniel Gröber (dxld) <dxld@darkboxed.org> | 2019-09-17 17:48:26 +0200 |
| commit | 23864c59abfc6dad5a6b137941d618903817e1e3 (patch) | |
| tree | 7a7394017e8ec0595acb8bb0a5ec3201b8bbaf47 /src/CabalHelper/Compiletime/Cabal.hs | |
| parent | a93ed8c7d93df1860d2e56b400b724ac47edf470 (diff) | |
Allow passing override-env to process functions
Unfortunately we need this to pass a custom GHC executable path to stack,
since it doesn't have an option to override it on the commandline (yet?).
Diffstat (limited to 'src/CabalHelper/Compiletime/Cabal.hs')
| -rw-r--r-- | src/CabalHelper/Compiletime/Cabal.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/CabalHelper/Compiletime/Cabal.hs b/src/CabalHelper/Compiletime/Cabal.hs index 85ab83c..ef6de8c 100644 --- a/src/CabalHelper/Compiletime/Cabal.hs +++ b/src/CabalHelper/Compiletime/Cabal.hs @@ -182,15 +182,15 @@ unpackCabalHackage cabalVer tmpdir variant = do dir = tmpdir </> cabal variant_opts = case variant of Pristine -> [ "--pristine" ]; _ -> [] args = [ "get", cabal ] ++ variant_opts - callProcessStderr (Just tmpdir) (cabalProgram ?progs) args + callProcessStderr (Just tmpdir) [] (cabalProgram ?progs) args return $ CabalSourceDir dir unpackCabalHEAD :: Env => FilePath -> IO (CommitId, CabalSourceDir) unpackCabalHEAD tmpdir = do let dir = tmpdir </> "cabal-head.git" url = "https://github.com/haskell/cabal.git" - callProcessStderr (Just "/") "git" [ "clone", "--depth=1", url, dir] - callProcessStderr (Just (dir </> "Cabal")) "cabal" + callProcessStderr (Just "/") [] "git" [ "clone", "--depth=1", url, dir] + callProcessStderr (Just (dir </> "Cabal")) [] "cabal" [ "act-as-setup", "--", "sdist" , "--output-directory=" ++ tmpdir </> "Cabal" ] commit <- takeWhile isHexDigit <$> |