From 8361b82d0ac59f436f7ecef283077b0f7d689ca1 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 02:13:18 +0200 Subject: refactor(third_party): 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 //third_party Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912 Tested-by: BuildkiteCI Reviewed-by: sterni --- third_party/protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/protobuf/default.nix') diff --git a/third_party/protobuf/default.nix b/third_party/protobuf/default.nix index 84ac44c26bee..ce4a2f8aa5b4 100644 --- a/third_party/protobuf/default.nix +++ b/third_party/protobuf/default.nix @@ -1,7 +1,7 @@ # Pin protobuf to version 3.12, with LLVM. -{ pkgs, ... }: +{ depot, pkgs, ... }: -pkgs.callPackage "${pkgs.nixpkgsSrc}/pkgs/development/libraries/protobuf/generic-v3.nix" { +pkgs.callPackage "${depot.third_party.nixpkgsSrc}/pkgs/development/libraries/protobuf/generic-v3.nix" { version = "3.12.2"; sha256 = "1lp368aa206vpic9fmax4k6llnmf28plfvkkm4vqhgphmjqykvl2"; stdenv = pkgs.llvmPackages.libcxxStdenv; -- cgit 1.4.1