diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-05-10 18:44:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-10 18:44:44 +0200 |
commit | 4b7aea9e8cd17bbabaea70400b50af4e8140c696 (patch) | |
tree | b72b9eff0d643484316c6b87d3bc3ac0e3e14707 /pkgs/misc | |
parent | 38c093e3760897e92f826f69eec21c91d38a05fc (diff) | |
parent | 477c552c7d70135819e8b3c04860336abeb7e811 (diff) | |
download | nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.tar nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.tar.gz nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.tar.bz2 nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.tar.lz nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.tar.xz nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.tar.zst nixlib-4b7aea9e8cd17bbabaea70400b50af4e8140c696.zip |
Merge pull request #61237 from basvandijk/journalbeat-fixes
NixOS: support journalbeat >= 6
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/logging/beats/6.x.nix | 3 | ||||
-rw-r--r-- | pkgs/misc/logging/beats/7.x.nix | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2cfae05c9242..5351b253eedc 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -45,5 +45,8 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; + postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 629f4128acb7..12e08dfeec69 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -45,5 +45,8 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; + postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; }; } |