From a5d8f5273c096f9770647e584532af4b388d6bbf Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 10 Apr 2021 23:20:55 +0200
Subject: [PATCH] fix(3p/nix): Fix dependency inclusion and reenable CI

Change-Id: Ic2b7db4abe636b73b4c71e6a2f1501d3b4b8b90e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2922
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
---
 third_party/nix/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index d3adabe2b..2a66925f0 100644
--- a/third_party/nix/default.nix
+++ b/third_party/nix/default.nix
@@ -73,8 +73,8 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
     (import ./clangd.nix pkgs)
   ];
 
- # TODO(tazjin): Some of these might only be required for native inputs
-  buildInputs = with pkgs; [
+  # TODO(tazjin): Some of these might only be required for native inputs
+  buildInputs = (with pkgs; [
     aws-s3-cpp
     brotli
     bzip2
@@ -88,7 +88,7 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
     openssl
     sqlite
     xz
-  ] ++ (with depot.third_party; [
+  ]) ++ (with depot.third_party; [
     abseil_cpp
     glog
     grpc
@@ -101,9 +101,9 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
   # Preserve debug symbols, for core dumps + other live debugging
   dontStrip = true;
 
-  installCheckInputs = with pkgs; [
-    depot.third_party.gtest
-    fd
+  installCheckInputs = with depot.third_party; [
+    gtest
+    pkgs.fd
     rapidcheck
   ];
 
@@ -188,9 +188,6 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
   # TODO(tazjin): integration test setup?
   # TODO(tazjin): docs generation?
 
-  # TODO(tazjin): Sort out after CL/2910 lands
-  meta.ci = false;
-
   passthru = {
     build-shell = self.overrideAttrs (up: rec {
       run_clang_tidy = pkgs.writeShellScriptBin "run-clang-tidy" ''