Skip to content

Commit

Permalink
haskellPackages.ghc.withPackages: Remove obsolete ghcide wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
maralorn authored and peti committed Sep 18, 2020
1 parent 59617bc commit ae73fa0
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions pkgs/development/haskell-modules/with-packages-wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit ae73fa0

Please sign in to comment.