diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-01-11 14:28:17 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-01-11 14:30:09 -0500 |
| commit | 2395ac641b09e6ca442f69e45269e8ade87cd2f1 (patch) | |
| tree | d99b63965d2a64d1adb8dcf54413f86a50230212 | |
| parent | haskell/with-packages-wrapper.nix: remove /bin symlink if it exists (diff) | |
| download | nixpkgs-2395ac641b09e6ca442f69e45269e8ade87cd2f1.tar.gz | |
Revert "add doc to ghc wrapper"
This reverts commit 93aabab7605c21f5962df2dffa7fee9ac17ba848.
This reverts commit e9156086187b09970e5cdb5178450c73ae59ecd6.
Based on change in master at d1bd0fbfcc0ee6b0fcaf662cca5ee4ba8932f141
opened in https://github.com/NixOS/nixpkgs/pull/77442
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 404fd0d94408..49beed8549db 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -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 |