From e4abe06b8ab61b9808d753f3fa74421f68ad1ad3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Mar 2016 12:39:29 -0800 Subject: [PATCH] ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's pgks --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 5c14fe788f7a..90f84d4387bc 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -28,7 +28,8 @@ self: super: # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; + inherit (self.ghc.bootPkgs) + jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; # This is the list of the Stage 1 packages that are built into a booted ghcjs installation # It can be generated with the command: