Skip to content

Commit

Permalink
Revert "add doc to ghc wrapper"
Browse files Browse the repository at this point in the history
This reverts commit 93aabab.
This reverts commit e915608.

Based on change in master at d1bd0fb
opened in NixOS#77442
  • Loading branch information
matthewbauer committed Jan 11, 2020
1 parent 93aabab commit 2395ac6
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions pkgs/development/haskell-modules/with-packages-wrapper.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, ghc, llvmPackages, packages, buildEnv, makeWrapper
{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
, withLLVM ? false
, postBuild ? ""
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
Expand Down Expand Up @@ -51,25 +51,15 @@ let
++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang);
in
if paths == [] && !withLLVM then ghc else
buildEnv {
symlinkJoin {
# this makes computing paths from the name attribute impossible;
# if such a feature is needed, the real compiler name should be saved
# as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages";
paths = paths ++ [ghc];
extraOutputsToInstall = ["doc"];
postBuild = ''
. ${makeWrapper}/nix-support/setup-hook
# We make changes to ghc binaries in $out/bin. buildEnv gives a
# symlink if only one of the paths has the subdirectory. If so,
# we need to remove it for our new wrappers.
if [ -L "$out/bin" ]; then
rm -f "$out/bin"
mkdir -p "$out/bin"
fi
# wrap compiler executables with correct env variables
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
Expand Down

0 comments on commit 2395ac6

Please sign in to comment.