Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ghcide: remove redundant env NIX_GHC_LIBDIR #2819

Merged
merged 2 commits into from
May 23, 2022
Merged

ghcide: remove redundant env NIX_GHC_LIBDIR #2819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
929cf9b
ghcide: remove redundant env NIX_GHC_LIBDIR
sloorush Apr 9, 2022
a6d6ef4
Merge branch 'master' into fix-#1777
pepeiborra May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ghcide/session-loader/Development/IDE/Session/VersionCheck.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
-- See https://github.com/haskell/ghcide/pull/697
module Development.IDE.Session.VersionCheck (ghcVersionChecker) where

import Data.Maybe
import GHC.Check
import GHC.Check
-- Only use this for checking against the compile time GHC libDir!
-- Use getRuntimeGhcLibDir from hie-bios instead for everything else
-- otherwise binaries will not be distributable since paths will be baked into them
import qualified GHC.Paths
import System.Environment

ghcVersionChecker :: GhcVersionChecker
ghcVersionChecker = $$(makeGhcVersionChecker (fromMaybe GHC.Paths.libdir <$> lookupEnv "NIX_GHC_LIBDIR"))
ghcVersionChecker = $$(makeGhcVersionChecker (return GHC.Paths.libdir))