diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-06-10 23:42:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-10 23:42:23 +0100 |
| commit | da690bdf2db6229c595fdbd482fa7987778dcfb0 (patch) | |
| tree | 2230e447900c04a315c7cd5dfe108b2006f09879 /pkgs | |
| parent | f80d7868537da7f8b2146efb738837485d851830 (diff) | |
| parent | 00892b7e4ed2e8eb52227db8e8312a06bd1d6699 (diff) | |
| download | nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.tar nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.tar.gz nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.tar.bz2 nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.tar.lz nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.tar.xz nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.tar.zst nixlib-da690bdf2db6229c595fdbd482fa7987778dcfb0.zip | |
Merge pull request #26493 from dmjio/patch-1
generic-builder.nix: Update doHaddock
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7d21996fe1cd..9516aca53663 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,8 +34,7 @@ , license , maintainers ? [] , doCoverage ? false -# TODO Do we care about haddock when cross-compiling? -, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") +, doHaddock ? (!ghc.isHaLVM or true) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] |