diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-03-15 18:55:18 +0100 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-03-15 20:16:54 +0100 |
| commit | 2956cc87603b1961ddc0f930c07e51c82613b59a (patch) | |
| tree | 16793ef6a2c4e6b3377ae0e2bd440a9c2c3e852f /pkgs/development/haskell-modules/with-packages-wrapper.nix | |
| parent | cc4677c36ee8d880e881459ad114fd2224b3ac1c (diff) | |
| download | nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.tar nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.tar.gz nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.tar.bz2 nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.tar.lz nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.tar.xz nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.tar.zst nixpkgs-2956cc87603b1961ddc0f930c07e51c82613b59a.zip | |
haskellPackages.ghcWithPackages: Wrap haddock with GHC lib dir
Diffstat (limited to 'pkgs/development/haskell-modules/with-packages-wrapper.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index d858787f43c..03f0a1dd0a3 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -95,6 +95,15 @@ symlinkJoin { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" fi done + + # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976 + if [[ -x "${ghc}/bin/haddock" ]]; then + rm -f $out/bin/haddock + makeWrapper ${ghc}/bin/haddock $out/bin/haddock \ + --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"' \ + --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" + fi + '' + (lib.optionalString targetPlatform.isDarwin '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; |