From 9c5b5600ea3e8916af5715185ef57e57f36cf82b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 13:40:06 +0200 Subject: refactor(ops): 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. This commit cleans up a huge chunk of these uses in //ops Change-Id: I00faeb969eaa70760a26256274925b07998c2351 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2915 Tested-by: BuildkiteCI Reviewed-by: sterni --- ops/journaldriver/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ops/journaldriver') diff --git a/ops/journaldriver/default.nix b/ops/journaldriver/default.nix index cc274094a9..d2413e74cc 100644 --- a/ops/journaldriver/default.nix +++ b/ops/journaldriver/default.nix @@ -1,11 +1,9 @@ -{ depot, ... }: +{ depot, pkgs, ... }: -with depot.third_party; - -naersk.buildPackage { +depot.third_party.naersk.buildPackage { src = ./.; - buildInputs = [ + buildInputs = with pkgs; [ pkgconfig openssl systemd.dev ]; } -- cgit 1.4.1