suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
pull/13063/head
Michael Davis 2025-03-06 18:38:44 -05:00
parent c4d314d7ba
commit 19558839b7
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default.nix
View File

@ -16,6 +16,7 @@
./screenshot.png ./screenshot.png
./book ./book
./docs ./docs
./runtime
./flake.lock ./flake.lock
(fs.fileFilter (file: lib.strings.hasInfix ".git" file.name) ./.) (fs.fileFilter (file: lib.strings.hasInfix ".git" file.name) ./.)
(fs.fileFilter (file: file.hasExt "svg") ./.) (fs.fileFilter (file: file.hasExt "svg") ./.)
@ -66,7 +67,7 @@ in
doCheck = false; doCheck = false;
strictDeps = true; strictDeps = true;
# Sets the Helix runtimedir to the grammars # Sets the Helix runtime dir to the grammars
env.HELIX_DEFAULT_RUNTIME = "${runtimeDir}"; env.HELIX_DEFAULT_RUNTIME = "${runtimeDir}";
# Get all the application stuff in the output directory. # Get all the application stuff in the output directory.

1
flake.nix
View File

@ -72,7 +72,6 @@
++ (lib.optional stdenv.isLinux lldb) ++ (lib.optional stdenv.isLinux lldb)
++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation); ++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation);
shellHook = '' shellHook = ''
export HELIX_RUNTIME="$PWD/runtime"
export RUST_BACKTRACE="1" export RUST_BACKTRACE="1"
export RUSTFLAGS="''${RUSTFLAGS:-""} ${rustFlagsEnv}" export RUSTFLAGS="''${RUSTFLAGS:-""} ${rustFlagsEnv}"
''; '';