Unnamed repository; edit this file 'description' to name the repository.
flake: Avoid setting HELIX_RUNTIME in devShell
The runtime directory should be correctly set without the need to set
HELIX_RUNTIME manually because we check for a runtime directory within
CARGO_MANIFEST_DIR.
This change also filters the runtime directory out of the source file
set passed to buildRustPackage since the runtime directory is not needed
at compilation time.
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | flake.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/default.nix b/default.nix index 2f8ea435..d94e707d 100644 --- a/default.nix +++ b/default.nix @@ -16,6 +16,7 @@ ./screenshot.png ./book ./docs + ./runtime ./flake.lock (fs.fileFilter (file: lib.strings.hasInfix ".git" file.name) ./.) (fs.fileFilter (file: file.hasExt "svg") ./.) @@ -66,7 +67,7 @@ in doCheck = false; strictDeps = true; - # Sets the Helix runtimedir to the grammars + # Sets the Helix runtime dir to the grammars env.HELIX_DEFAULT_RUNTIME = "${runtimeDir}"; # Get all the application stuff in the output directory. @@ -72,7 +72,6 @@ ++ (lib.optional stdenv.isLinux lldb) ++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation); shellHook = '' - export HELIX_RUNTIME="$PWD/runtime" export RUST_BACKTRACE="1" export RUSTFLAGS="''${RUSTFLAGS:-""} ${rustFlagsEnv}" ''; |