From d62fab4168129180e964a02a5a72c91623d1b962 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 13:40:22 +0200 Subject: refactor(cheddar): Consistent use of depot.third_party vs. pkgs In preparation for the solution of b/108, we need to consistently use `depot.third_party` for packages that are only packed in the TVL depot and `pkgs` for things that come from nixpkgs. Change-Id: I49d82726b2f3bd7d4923effdd9a7e3f67ddc0659 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2916 Tested-by: BuildkiteCI Reviewed-by: sterni --- tools/cheddar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/cheddar') diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix index 66874db28688..b7c5070b3d51 100644 --- a/tools/cheddar/default.nix +++ b/tools/cheddar/default.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ depot, pkgs, ... }: -pkgs.naersk.buildPackage { +depot.third_party.naersk.buildPackage { src = ./.; doDoc = false; override = x: { # Use our custom bat syntax set, which is everything from upstream, # plus additional languages we care about. - BAT_SYNTAXES = "${pkgs.bat_syntaxes}"; + BAT_SYNTAXES = "${depot.third_party.bat_syntaxes}"; # LLVM packages (why are they even required?) are not found # automatically if added to buildInputs, hence this ... -- cgit 1.4.1