From 377773de0f40c031aec0fc25edfd5e7e2908f608 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 23 May 2023 11:26:45 +0200 Subject: [PATCH] helix: prevent grammars referencing sources --- pkgs/applications/editors/helix/grammars.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/helix/grammars.nix b/pkgs/applications/editors/helix/grammars.nix index be764ac75693..2f5f97970c4c 100644 --- a/pkgs/applications/editors/helix/grammars.nix +++ b/pkgs/applications/editors/helix/grammars.nix @@ -47,7 +47,6 @@ then "${source}/${grammar.source.subpath}" else source; - dontUnpack = true; dontConfigure = true; FLAGS = [ @@ -64,13 +63,13 @@ buildPhase = '' runHook preBuild - if [[ -e "$src/src/scanner.cc" ]]; then - $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS - elif [[ -e "$src/src/scanner.c" ]]; then - $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS + if [[ -e "src/scanner.cc" ]]; then + $CXX -c "src/scanner.cc" -o scanner.o $FLAGS + elif [[ -e "src/scanner.c" ]]; then + $CC -c "src/scanner.c" -o scanner.o $FLAGS fi - $CC -c "$src/src/parser.c" -o parser.o $FLAGS + $CC -c "src/parser.c" -o parser.o $FLAGS $CXX -shared -o $NAME.so *.o runHook postBuild