[nongnu] elpa/nix-mode 05d7c828b3 187/500: Fix nix-company and mmm-mode loading.

[ELPA Syncer]

branch: elpa/nix-mode
commit 05d7c828b322c2656b2df8654ab3681de613f015
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>

    Fix nix-company and mmm-mode loading.
---
 nix-company.el | 5 ++++-
 nix-mode.el    | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nix-company.el b/nix-company.el
index 6b912af588..19ca5cb617 100644
--- a/nix-company.el
+++ b/nix-company.el
@@ -8,6 +8,7 @@
 
 (require 'nix-repl)
 (require 'cl-lib)
+(require 'company)
 
 (defun company-nix (command &optional arg &rest _)
   "Company backend for Nix.
@@ -67,7 +68,9 @@ BUFFER check for Nix-REPL in current buffer"
                (setq nix--company-last-buffer (buffer-name))))
       backend-buf)))
 
-(add-to-list 'company-backends 'company-nix)
+;; install nix-company
+(add-hook 'nix-mode-hook (lambda ()
+                           (setq-local company-backends '(company-nix))))
 
 (provide 'nix-company)
 ;;; nix-company.el ends here
diff --git a/nix-mode.el b/nix-mode.el
index 177cf20532..8b56aba274 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -461,9 +461,9 @@ STRING-TYPE type of string based off of Emacs syntax table 
types"
 (nix-create-keymap)
 (nix-create-menu)
 
-(when (require 'company nil 'noerror) (require 'nix-company nil 'noerror))
-
-(when (require 'mmm-mode nil 'noerror) (require 'nix-mode-mmm nil 'noerror))
+;; TODO: find a better way to load this
+(when (find-library "company") (require 'nix-company nil 'noerror))
+(when (find-library "mmm-mode") (require 'nix-mode-mmm nil 'noerror))
 
 ;;;###autoload
 (defun nix-build (&optional attr dir)