diff options
| author | Peter Simons <simons@cryp.to> | 2017-02-15 13:05:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 13:05:06 +0100 |
| commit | cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63 (patch) | |
| tree | e5c3e4034559f0804f9fb9960f20fe952290b0bf /pkgs | |
| parent | 9e0867586cf147729ba84e4b0aaffff9b34eb669 (diff) | |
| parent | 057fae5ea0e6efa7356f444b505294267e6427d5 (diff) | |
| download | nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.tar nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.tar.gz nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.tar.bz2 nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.tar.lz nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.tar.xz nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.tar.zst nixlib-cb2499acd0c6a9de9bbf62d751ba35dfdd29ee63.zip | |
Merge pull request #22805 from LumiGuide/fix-hoogle-ghcjs
ghcWithHoogle: fix for ghcjs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/hoogle.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index a0b909628297..b6063f6ef977 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -40,14 +40,14 @@ let if !isGhcjs then "ghc" else "ghcjs"; - docLibGlob = + ghcDocLibDir = if !isGhcjs - then ''share/doc/ghc*/html/libraries'' - else ''doc/lib''; + then ghc.doc + ''/share/doc/ghc*/html/libraries'' + else ghc + ''/doc/lib''; # On GHCJS, use a stripped down version of GHC's prologue.txt prologue = if !isGhcjs - then "${ghc.doc}/${docLibGlob}/prologue.txt" + then "${ghcDocLibDir}/prologue.txt" else writeText "ghcjs-prologue.txt" '' This index includes documentation for many Haskell modules. ''; @@ -67,7 +67,7 @@ stdenv.mkDerivation { mkdir -p $out/share/doc/hoogle echo importing builtin packages - for docdir in ${ghc.doc}/${docLibGlob}/*; do + for docdir in ${ghcDocLibDir}/*; do name="$(basename $docdir)" ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then |