alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #77442 from NixOS/revert-76842-add-doc-to-ghc-wrapper

Browse source 
Revert patch: add "doc" to ghc wrapper
This commit is contained in:
Peter Simons 2020-01-10 20:25:28 +01:00 committed by GitHub
parent 566780f078 4a2aad0d39
commit d1bd0fbfcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/haskell-modules/with-packages-wrapper.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, ghc, llvmPackages, packages, buildEnv, makeWrapper { lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
, withLLVM ? false , withLLVM ? false
, postBuild ? "" , postBuild ? ""
, ghcLibdir ? null # only used by ghcjs, when resolving plugins , ghcLibdir ? null # only used by ghcjs, when resolving plugins
@ -51,25 +51,15 @@ let
++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang); ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang);
in in
if paths == [] && !withLLVM then ghc else if paths == [] && !withLLVM then ghc else
buildEnv { symlinkJoin {
# this makes computing paths from the name attribute impossible; # this makes computing paths from the name attribute impossible;
# if such a feature is needed, the real compiler name should be saved # if such a feature is needed, the real compiler name should be saved
# as a dedicated drv attribute, like `compiler-name` # as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages"; name = ghc.name + "-with-packages";
paths = paths ++ [ghc]; paths = paths ++ [ghc];
extraOutputsToInstall = ["doc"];
postBuild = '' postBuild = ''
. ${makeWrapper}/nix-support/setup-hook . ${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 # wrap compiler executables with correct env variables
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do