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:
Domen Kožar 2022-12-09 10:50:35 +00:00 committed by GitHub
commit a32b6064c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 = ''