Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc

2019-12-25 01:31:35 -05:00
parent 891662e829 95464f6ad3
commit a8bd27b454
3 changed files with 18 additions and 17 deletions
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -23,7 +23,8 @@
 # This will build mmorph and monadControl, and have the hoogle installation
 # refer to their documentation via symlink so they are not garbage collected.

-{ lib, stdenv, hoogle, writeText, ghc
+{ lib, stdenv, buildPackages
+, hoogle, writeText, ghc
 , packages
 }:

@@ -53,7 +54,7 @@ let
    (map (lib.getOutput "doc") packages);

 in
-stdenv.mkDerivation {
+buildPackages.stdenv.mkDerivation {
  name = "hoogle-local-0.1";
  buildInputs = [ghc hoogle];