mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(cheddar): Consistent use of depot.third_party vs. pkgs

Browse source 
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 <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-10 13:40:22 +02:00 committed by tazjin
parent f2443911cc
commit d62fab4168
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cheddar/default.nix
View file

@ -1,13 +1,13 @@
{ pkgs, ... }: { depot, pkgs, ... }:
pkgs.naersk.buildPackage { depot.third_party.naersk.buildPackage {
src = ./.; src = ./.;
doDoc = false; doDoc = false;
override = x: { override = x: {
# Use our custom bat syntax set, which is everything from upstream, # Use our custom bat syntax set, which is everything from upstream,
# plus additional languages we care about. # 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 # LLVM packages (why are they even required?) are not found
# automatically if added to buildInputs, hence this ... # automatically if added to buildInputs, hence this ...