Merge pull request #42 from liskin/system-ghc-fix-alternative

ch1bo · web-flow · commit 69bbc2178037 · 2016-10-16T12:17:55.000+02:00
Fixed ghc lib dir lookup via stack for system installed ghc
diff --git a/src/Stack.hs b/src/Stack.hs
@@ -52,7 +52,11 @@ getStackGhcBinDir :: FilePath -> IO (Maybe FilePath)
 getStackGhcBinDir = fmap (fmap trim) . execStackInPath "path --compiler-bin"
 
 getStackGhcLibDir :: FilePath -> IO (Maybe FilePath)
-getStackGhcLibDir = fmap (fmap takeDirectory) . execStackInPath "path --global-pkg-db"
+getStackGhcLibDir p = do
+    ghc <- (trim <$>) <$> execStackInPath "path --compiler-exe" p
+    case ghc of
+        Just exe -> (trim <$>) <$> execInPath (exe ++ " --print-libdir") p
+        Nothing -> return Nothing
 
 getStackDist :: FilePath -> IO (Maybe FilePath)
 getStackDist p = (trim <$>) <$> execStackInPath "path --dist-dir" p
