From 9885b70b7aa8e90da930a2cab2af9318d4bede88 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 15 Jun 2020 00:19:36 +0100 Subject: feat(cheddar): Override syntax highlighting for 'rules.pl' to Prolog Adds a mechanism for per-filename overrides of the chosen language syntax and configures it for Gerrit's submit rule file. This also switches the syntax set used to the one from //third_party/bat_syntaxes, which contains custom additions such as Prolog support. Change-Id: I2023dbad5b326305ef2ef0ecf34ef66a3f7575ab Reviewed-on: https://cl.tvl.fyi/c/depot/+/349 Reviewed-by: riking Reviewed-by: lukegb --- tools/cheddar/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tools/cheddar/default.nix') diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix index 5c86fec482..c65c782e6a 100644 --- a/tools/cheddar/default.nix +++ b/tools/cheddar/default.nix @@ -1,20 +1,17 @@ -{ depot, ... }: +{ pkgs, ... }: -with depot.third_party; - -naersk.buildPackage { +pkgs.naersk.buildPackage { src = ./.; doDoc = false; doCheck = false; override = x: { - # bat contains syntax highlighting packages for a lot more - # languages than what ships with syntect, and we can make use of - # them! - BAT_SYNTAXES = "${bat.src}/assets/syntaxes.bin"; + # Use our custom bat syntax set, which is everything from upstream, + # plus additional languages we care about. + BAT_SYNTAXES = "${pkgs.bat_syntaxes}"; # LLVM packages (why are they even required?) are not found # automatically if added to buildInputs, hence this ... - LIBCLANG_PATH = "${llvmPackages.libclang}/lib/libclang.so.10"; + LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib/libclang.so.10"; }; } -- cgit 1.4.1