Unverified Commit a32b6064 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #205267 from actionshrimp/datadog-agent-ld-rtloader 

datadog-agent: fix error on startup due to go119 and ld path
parents facc17ac 845e54e9

pkgs/tools/networking/dd-agent/datadog-agent.nix

+3 −4
Original line number Diff line number Diff line 
{ 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 = ''