From 66e38ec96268d7df78d44ac3e93754318d05b612 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Sat, 14 Feb 2015 22:45:14 -0500
Subject: [PATCH] Lazy load ghc-comp-init in haskell layer

---
 contrib/lang/haskell/packages.el | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/contrib/lang/haskell/packages.el b/contrib/lang/haskell/packages.el
index 463dd0777..bdcab477d 100644
--- a/contrib/lang/haskell/packages.el
+++ b/contrib/lang/haskell/packages.el
@@ -12,6 +12,7 @@
 
 (defvar haskell-packages
   '(
+    company-ghc
     flycheck
     flycheck-haskell
     ghc
@@ -19,10 +20,6 @@
     hi2
     ))
 
-;; Only load company-ghc if company-mode is enabled
-(when (member 'company-mode dotspacemacs-configuration-layers)
-  (add-to-list 'haskell-packages 'company-ghc))
-
 (defun haskell/init-flycheck ()
   ;;(add-hook 'haskell-mode-hook 'flycheck-mode))
   (add-hook 'flycheck-mode-hook 'flycheck-haskell-setup))
@@ -161,11 +158,12 @@
         (define-key haskell-cabal-mode-map [?\C-c ?\C-z] 'haskell-interactive-switch)))))
 
 (defun haskell/init-company-ghc ()
-  (use-package ghc
-    :init 
-    (add-to-list 'company-backends 'company-ghc)
-    (ghc-comp-init)
-    ))
+  (use-package company-ghc
+    :if (configuration-layer/layer-declaredp 'company-mode)
+    :init
+    (progn
+      (add-to-list 'company-backends 'company-ghc)
+      (add-hook 'haskell-mode-hook 'ghc-comp-init))))
 
 (defun haskell/init-hi2 ()
   (use-package hi2