aboutsummaryrefslogtreecommitdiffhomepage
path: root/default.nix
diff options
context:
space:
mode:
authorGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2017-11-30 13:33:18 +0100
committerGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2017-11-30 13:35:45 +0100
commit03d7ff2f27b31bf2f7259064184b1b93f53d7998 (patch)
tree9f49b70e72334217c2beb8245baa2bf40c5515c7 /default.nix
parentee45637ac2431fe2df1994f2337d8801e2aeff9a (diff)
Add merlin in the dependencies of nix-shell only.
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/default.nix b/default.nix
index 9efabdbc2..86f86ff99 100644
--- a/default.nix
+++ b/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
rsync
which
+ ] else []) ++ (if lib.inNixShell then [
+ ocamlPackages.merlin
] else []);
src =