From 818cabf53bc327d43fefe5552261cce6c70b931d Mon Sep 17 00:00:00 2001
From: John Soo <john@consumable.com>
Date: Tue, 7 Sep 2021 16:19:17 -0700
Subject: [PATCH] datadog-agent: Don't use invoke during build.

---
 pkgs/tools/networking/dd-agent/datadog-agent.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 55580cdd34f4..7f500b2c09fc 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, makeWrapper, fetchgit, git, invoke, pyaml, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
+{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
 
 let
   # keep this in sync with github.com/DataDog/agent-payload dependency
@@ -12,11 +12,10 @@ in buildGoModule rec {
   pname = "datadog-agent";
   version = "7.30.2";
 
-  src = fetchgit {
-    url = "https://${goPackagePath}.git";
+  src = fetchFromGitHub {
+    inherit owner repo;
     rev = version;
-    leaveDotGit = true;
-    sha256 = "1cpybjwnby265w307p3hdg06448xrmapjbvd6zp46d7rsi4lj6vn";
+    sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd";
   };
 
   vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi";
@@ -30,7 +29,7 @@ in buildGoModule rec {
   ];
 
 
-  nativeBuildInputs = [ git pyaml invoke pkg-config makeWrapper ];
+  nativeBuildInputs = [ pkg-config makeWrapper ];
   buildInputs = [ systemd ];
   PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
 
@@ -44,7 +43,8 @@ in buildGoModule rec {
     ];
   in ''
     buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}")
-    invoke generate --mod=vendor
+    # Keep directories to generate in sync with tasks/go.py
+    go generate ./pkg/status ./cmd/agent/gui
   '';
 
   # DataDog use paths relative to the agent binary, so fix these.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e211265b0073..b21a4909fb49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23983,8 +23983,6 @@ with pkgs;
   dd-agent = callPackage ../tools/networking/dd-agent/5.nix { };
   datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
     pythonPackages = datadog-integrations-core {};
-    invoke = python3Packages.invoke;
-    pyaml = python3Packages.pyaml;
   };
   datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
   datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {