diff options
| author | Domen Kožar <domen@dev.si> | 2022-12-09 10:50:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 10:50:35 +0000 |
| commit | a32b6064c49199c4d42c7a3241ee1a520a51fe19 (patch) | |
| tree | e19f5ae9efc8797392dcd8ba3e1bfc62b1f6721a /pkgs/tools/networking | |
| parent | facc17ace3a5be60487aa1b528bb134b9f05de88 (diff) | |
| parent | 845e54e94b4bfba4b99ce636f35415e4d5d86d08 (diff) | |
| download | nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.tar nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.tar.gz nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.tar.bz2 nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.tar.lz nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.tar.xz nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.tar.zst nixpkgs-a32b6064c49199c4d42c7a3241ee1a520a51fe19.zip | |
Merge pull request #205267 from actionshrimp/datadog-agent-ld-rtloader
datadog-agent: fix error on startup due to go119 and ld path
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/dd-agent/datadog-agent.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 741ef083422..b83083936a3 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -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 = '' |