Skip to content

Commit 490de70

Browse files
committed
Fix: Stack image container does not work
fixes #1473 (cherry picked from commit 2301b9b)
1 parent e72de9a commit 490de70

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/Stack/Nix.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ reexecWithOptionalShell inner =
4747
isReExec <- asks getReExec
4848
if nixEnable (configNix config) && not inShell && not isReExec
4949
then runShellAndExit getCmdArgs
50-
else liftIO (inner >> exitSuccess)
50+
else liftIO inner
5151
where
5252
getCmdArgs = do
5353
args <-

src/main/Main.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,7 @@ withBuildConfigExt go@GlobalOpts{..} mbefore inner mafter = do
809809
(lcProjectRoot lc)
810810
mbefore
811811
(runStackTGlobal manager (lcConfig lc) go $
812-
Nix.reexecWithOptionalShell (inner'' lk0)
813-
)
812+
Nix.reexecWithOptionalShell (inner'' lk0))
814813
mafter
815814
(Just $ liftIO $
816815
do lk' <- readIORef curLk

0 commit comments

Comments
 (0)