Merge ".envrc: remove MAKEFLAGS and use clang environment by default" into main

.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
2024-06-25 20:42:46 +00:00 · 2024-06-25 12:36:18 -06:00
1 changed files with 2 additions and 6 deletions
--- 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 native-clangStdenvPackages to get clangd by default.
-use flake ".#${LIX_SHELL_VARIANT:-default}" "${LIX_SHELL_EXTRA_ARGS[@]}"
+use flake ".#${LIX_SHELL_VARIANT:-native-clangStdenvPackages}" "${LIX_SHELL_EXTRA_ARGS[@]}"
 export MAKEFLAGS="$MAKEFLAGS -e"
 if [[ -n "$NIX_BUILD_CORES" ]]; then
    export MAKEFLAGS="$MAKEFLAGS -j $NIX_BUILD_CORES"
 fi
 export GTEST_BRIEF=1
Author	SHA1	Message	Date
Lunaphied	f170870ae7	Merge ".envrc: remove MAKEFLAGS and use clang environment by default" into main	2024-06-25 20:42:46 +00:00
Lunaphied	97c86908a4	.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`	2024-06-25 12:36:18 -06:00