Skip to content

Mangoiv/fix envrc #3724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MangoIV merged 2 commits into from
Nov 16, 2023
Merged

Mangoiv/fix envrc #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d7c4e
[fix] fix the envrc invocation
MangoIV Nov 16, 2023
a63d64c
[fix] add the $NIX_CONFIG environment variable
MangoIV Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ 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'

@flokli flokli Dec 13, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke my setup somewhat:

❯ cd dev/wire/wire-server
direnv: error /home/flokli/dev/wire/wire-server/.envrc is blocked. Run `direnv allow` to approve its content
❯ direnv allow
direnv: loading ~/dev/wire/wire-server/.envrc                         
🔧 Building environment
warning: unknown experimental feature 'flakes'
warning: unknown experimental feature 'flakes'
⏱ 4sdirenv: ([/nix/store/0lf6mkfaqx4zmsni9yys650qx573zfcw-direnv-2.33.0/bin/direnv export zsh]) is taking a while to execute. Use CTRL-C to give up.
⏱ 8s^C
^C^X^C^C^C

I got stuck here.

@flokli flokli Dec 13, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out, we're not using any flake features, so we can just disable this again: #3777


[[ -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
Expand All @@ -25,11 +27,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"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ result-*
# Created by .envrc
.direnv
.env
.env-hs-run

# emacs misc
.dir-locals.el
Expand Down