From 4e67e3da06d0282f30c27cda547c91e10a483a66 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 4 Jun 2020 02:48:57 +0200 Subject: ghc.withPackages: Add wrapper for ghcide --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 32fa46fd04ac..3b8d906cecef 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -105,6 +105,15 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi + # ghcide does package discovery without calling our ghc wrapper. + if [[ -x "$out/bin/ghcide" ]]; then + wrapProgram $out/bin/ghcide \ + --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 + '' + (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"; -- cgit 1.4.1