[nongnu] elpa/nix-mode 30587b2205 411/500: Merge pull request #114 from TristanCacqueray/master

[ELPA Syncer]

branch: elpa/nix-mode
commit 30587b2205859810d8a00877718be2912e349b9b
Merge: 3022b9ef74 aaf2b741fb
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #114 from TristanCacqueray/master
    
    nix-shell: skip non-default packages integration
---
 nix-shell.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nix-shell.el b/nix-shell.el
index 1a996e3891..e8b5c8d21f 100644
--- a/nix-shell.el
+++ b/nix-shell.el
@@ -179,11 +179,13 @@ The DRV file to use."
          (add-to-list 'exec-path bin)
          (setq-local eshell-path-env
                      (format "%s:%s" bin eshell-path-env))
-         (add-to-list 'woman-manpath man)
+      (when (boundp 'woman-manpath)
+           (add-to-list 'woman-manpath man))
          (add-to-list 'ffap-c-path include)
          (add-to-list 'Man-header-file-path include)
-         (add-to-list 'irony-additional-clang-options
-                      (format "-I%s" include))))
+      (when (boundp 'irony-additional-clang-options)
+           (add-to-list 'irony-additional-clang-options
+                      (format "-I%s" include)))))
 
       (when (bound-and-true-p flycheck-mode)
        (flycheck-buffer))