From 7ae86e21a36265d432a7384a525add7ca617b0bf Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 29 Apr 2024 18:48:20 +0200 Subject: fix lorri flake compatibility --- .envrc | 7 ++++++- shell.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index 3550a30f..8075d5b0 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,6 @@ -use flake +if type -P lorri &>/dev/null; then + eval "$(lorri direnv)" +else + echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]' + use flake +fi diff --git a/shell.nix b/shell.nix index 9730ebde..d2c4c458 100644 --- a/shell.nix +++ b/shell.nix @@ -1,3 +1,3 @@ { system ? builtins.currentSystem }: -(builtins.getFlake (toString ./.)).devShell.${system} +(builtins.getFlake (toString ./.)).devShells.${system}.default -- cgit 1.4.1