From 929cf9b806dd97503a1d66a4628e0a14c1634d85 Mon Sep 17 00:00:00 2001 From: sloorush Date: Sun, 10 Apr 2022 02:57:04 +0530 Subject: [PATCH] ghcide: remove redundant env NIX_GHC_LIBDIR --- .../session-loader/Development/IDE/Session/VersionCheck.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ghcide/session-loader/Development/IDE/Session/VersionCheck.hs b/ghcide/session-loader/Development/IDE/Session/VersionCheck.hs index be58f420fb..a5fbda891c 100644 --- a/ghcide/session-loader/Development/IDE/Session/VersionCheck.hs +++ b/ghcide/session-loader/Development/IDE/Session/VersionCheck.hs @@ -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))