Merge pull request #205267 from actionshrimp/datadog-agent-ld-rtloader
datadog-agent: fix error on startup due to go119 and ld path
This commit is contained in:
commit
a32b6064c4
1 changed files with 3 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, buildGoModule
|
||||
, buildGo118Module
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
, pythonPackages
|
||||
|
@ -35,7 +35,7 @@ let
|
|||
cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"];
|
||||
};
|
||||
|
||||
in buildGoModule rec {
|
||||
in buildGo118Module rec {
|
||||
pname = "datadog-agent";
|
||||
inherit src version;
|
||||
|
||||
|
@ -100,8 +100,7 @@ in buildGoModule rec {
|
|||
|
||||
wrapProgram "$out/bin/agent" \
|
||||
--set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd '' \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib
|
||||
'';
|
||||
--prefix LD_LIBRARY_PATH : '' + lib.makeLibraryPath [ (lib.getLib systemd) rtloader ];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
|
|
Loading…
Reference in a new issue