mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Revert "haskell/with-packages-wrapper.nix: install "doc" outputs"
This commit is contained in:
parent
01d93cbbe1
commit
4a2aad0d39
@ -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
|
||||
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user