diff options
| author | Casey Ransom <casey@dailykos.com> | 2019-06-27 13:52:16 -0400 |
|---|---|---|
| committer | Casey Ransom <casey@dailykos.com> | 2019-07-01 11:45:19 -0400 |
| commit | 35d58c3421fea71394fa3b3e8c10bd862d76f3d8 (patch) | |
| tree | 32cf12be5edaee9f8ea9e95730dbfe264439929d /pkgs/tools/networking/dd-agent | |
| parent | b5478fd1a2ef442a54c36031bf3a27a96b5ea31c (diff) | |
| download | nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.gz nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.bz2 nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.lz nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.xz nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.zst nixpkgs-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.zip | |
datadog-agent: fix extraIntegrations
The override that builds the custom python for integrations-core was
overriding python, but pythonPackages was still being inherited from a
call to `datadog-integrations-core {}`, causing
service.datadog-agent.extraIntegrations to be ignored.
Diffstat (limited to 'pkgs/tools/networking/dd-agent')
| -rw-r--r-- | pkgs/tools/networking/dd-agent/datadog-agent.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index fbf7efb6933..d2ae24c8a71 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -3,6 +3,7 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency payloadVersion = "4.7.1"; + python = pythonPackages.python; in buildGoPackage rec { name = "datadog-agent-${version}"; @@ -26,8 +27,6 @@ in buildGoPackage rec { goDeps = ./datadog-agent-deps.nix; goPackagePath = "github.com/${owner}/${repo}"; - # Explicitly set this here to allow it to be overridden. - python = pythonPackages.python; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ systemd ]; |