aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.envrc9
-rw-r--r--.travis.yml2
2 files changed, 9 insertions, 2 deletions
diff --git a/.envrc b/.envrc
index 4a4726a..f4c5cf4 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,8 @@
-use_nix
+command -v lorri >/dev/null 2>&1
+lorri_available=$?
+
+if [[ $lorri_available -eq 0 ]]; then
+ eval "$(lorri direnv)"
+else
+ use nix
+fi
diff --git a/.travis.yml b/.travis.yml
index 942cd62..4ee507a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,6 @@ jobs:
- name: "Nix build"
env: NIX=1
-before_script: nix-env -i cabal ghc
+before_script: nix-env -i cabal-install ghc
script: ./scripts/build.sh