From 43d7c4ebb3f9f8eda9693264b3aa71e19edb8118 Mon Sep 17 00:00:00 2001
From: Magnus Viernickel <magnus.viernickel@wire.com>
Date: Thu, 16 Nov 2023 12:02:16 +0100
Subject: [PATCH 1/2] [fix] fix the envrc invocation

---
 .envrc     | 5 +++--
 .gitignore | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.envrc b/.envrc
index 058133b3db0..4c9a26b7403 100644
--- a/.envrc
+++ b/.envrc
@@ -15,7 +15,7 @@ env_dir=./.env
 
 [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
 
-if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
+if [[ ! -d "$env_dir" || ! -d "./.env-hs-run" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
   bcmd=nix
   if command -v nom &> /dev/null; then
     if [[ "${USE_NOM}" != "0" ]]; then
@@ -25,11 +25,12 @@ if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(<
   echo "🔧 Building environment"
   $bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env
   echo "🔧 Building hs-run"
-  $bcmd build github:wireapp/ghc-flakr -Lv --out-link ./.env
+  $bcmd build github:wireapp/ghc-flakr -Lv --out-link ./.env-hs-run
   echo "$store_paths" > "$layout_dir/nix-rebuild"
 fi
 
 PATH_add "./.env/bin"
+PATH_add "./.env-hs-run/bin"
 path_add "PKG_CONFIG_PATH" "./.env/lib/pkgconfig"
 path_add "LIBRARY_PATH" "./.env/lib"
 path_add "PYTHONPATH" "./hack/python"
diff --git a/.gitignore b/.gitignore
index b1af8dfb780..0098fc0a6f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,7 @@ result-*
 # Created by .envrc
 .direnv
 .env
+.env-hs-run
 
 # emacs misc
 .dir-locals.el

From a63d64c63ae5e46ef377cf5849c65e06a42c0b53 Mon Sep 17 00:00:00 2001
From: Magnus Viernickel <magnus.viernickel@wire.com>
Date: Thu, 16 Nov 2023 15:07:10 +0100
Subject: [PATCH 2/2] [fix] add the $NIX_CONFIG environment variable

---
 .envrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.envrc b/.envrc
index 4c9a26b7403..a87a0775d7b 100644
--- a/.envrc
+++ b/.envrc
@@ -13,6 +13,8 @@ store_paths=$(echo "$nix_files" | xargs nix-store --add ./nix)
 layout_dir=$(direnv_layout_dir)
 env_dir=./.env
 
+export NIX_CONFIG='extra-experimental-features = nix-command flakes'
+
 [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
 
 if [[ ! -d "$env_dir" || ! -d "./.env-hs-run" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then