aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLunaphied <lunaphied@lunaphied.me>2024-06-25 12:35:16 -0600
committerLunaphied <lunaphied@lunaphied.me>2024-06-25 12:36:18 -0600
commit97c86908a412f09d715e32710e696bb19bbdb23b (patch)
treefc1d531dfc01c01316f215ea740eba2e0489fac5
parentc097ebe66bf474da886ffa20d2f31bdb1d2196a8 (diff)
.envrc: remove MAKEFLAGS and use clang environment by default
MAKEFLAGS hasn't been relevant since we switched off the Make buildsystem and using the clang environment by default gives you clangd by default which most developers will want. Change-Id: I9c11d0613577047e6c908f049c1ffaca5fb5ff67
-rw-r--r--.envrc8
1 files changed, 2 insertions, 6 deletions
diff --git a/.envrc b/.envrc
index e6505ace6..1868dd4e6 100644
--- a/.envrc
+++ b/.envrc
@@ -1,9 +1,5 @@
# shellcheck shell=bash
source_env_if_exists .envrc.local
-# TODO: `use flake .#native-clangStdenvPackages` on macOS?
-use flake ".#${LIX_SHELL_VARIANT:-default}" "${LIX_SHELL_EXTRA_ARGS[@]}"
-export MAKEFLAGS="$MAKEFLAGS -e"
-if [[ -n "$NIX_BUILD_CORES" ]]; then
- export MAKEFLAGS="$MAKEFLAGS -j $NIX_BUILD_CORES"
-fi
+# Use native-clangStdenvPackages to get clangd by default.
+use flake ".#${LIX_SHELL_VARIANT:-native-clangStdenvPackages}" "${LIX_SHELL_EXTRA_ARGS[@]}"
export GTEST_BRIEF=1