Skip to content

Commit 4067326

Browse files
authored
Merge pull request #124 from jneira/fix-install-dev
Fix install script dev target
2 parents 6dc7894 + 1bcd292 commit 4067326

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

install/src/HlsInstall.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ defaultMain = do
7575
-- stack specific targets
7676
-- Default `stack.yaml` uses ghc-8.8.2 and we can't build hls in windows
7777
-- TODO: Enable for windows when it uses ghc-8.8.3
78-
when (isRunFromStack && not isWindowsSystem) $
78+
when isRunFromStack $
7979
phony "dev" $ do
8080
need ["show-options"]
8181
stackInstallHlsWithErrMsg Nothing args

install/src/Stack.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ stackInstallHls mbVersionNumber args = do
2222
Nothing -> do
2323
execStackWithCfgFile_ "stack.yaml" $
2424
["install"
25-
, "haskell-language-server-wrapper"
26-
, "haskell-language-server"] ++ args
25+
, ":haskell-language-server-wrapper"
26+
, ":haskell-language-server"] ++ args
2727
getGhcVersionOfCfgFile "stack.yaml" args
2828
Just vn -> do
2929
execStackWithGhc_ vn $ ["install"] ++ args

0 commit comments

Comments
 (0)