haskellPackages.ghc.withPackages: Remove obsolete ghcide wrapper
This commit is contained in:
parent
59617bc142
commit
ae73fa0d56
@ -105,18 +105,6 @@ symlinkJoin {
|
||||
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
|
||||
fi
|
||||
|
||||
# ghcide 0.2.0 does package discovery without calling our ghc wrapper.
|
||||
# 2020-08-16 We can most likely remove this workaround as soon as we build ghcide with a newer hie-bios (currently we use 0.5.1 from stack)
|
||||
for prg in ghcide; do
|
||||
if [[ -x "$out/bin/$prg" ]]; then
|
||||
wrapProgram $out/bin/$prg \
|
||||
--set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \
|
||||
--set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \
|
||||
--set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \
|
||||
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
|
||||
fi
|
||||
done
|
||||
|
||||
'' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
|
||||
# Work around a linker limit in macOS Sierra (see generic-builder.nix):
|
||||
local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
|
||||
|
Loading…
Reference in New Issue
Block a user