diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-05-10 15:27:45 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-05-10 15:27:45 +0200 |
commit | 6f0a6bfc60206bfadb5e75cf106ca584355de590 (patch) | |
tree | 18103970488a17eaa2017d36b14584a9b34634d7 /pkgs/tools/system | |
parent | 46a869b286fb42fe83d8c44d1cea21fa8160314c (diff) | |
download | nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.tar nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.tar.gz nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.tar.bz2 nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.tar.lz nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.tar.xz nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.tar.zst nixlib-6f0a6bfc60206bfadb5e75cf106ca584355de590.zip |
journalbeat: patchelf the binary instead of using a wrapper
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/journalbeat/default.nix | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 20951fe52406..0f13d2d3da1c 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -1,24 +1,9 @@ -{ lib, pkgs, buildGoPackage, fetchFromGitHub, makeWrapper }: - -let - - libPath = lib.makeLibraryPath [ pkgs.systemd.lib ]; - -in buildGoPackage rec { +{ lib, systemd, buildGoPackage, fetchFromGitHub, makeWrapper }: +buildGoPackage rec { name = "journalbeat-${version}"; version = "5.6.8"; - goPackagePath = "github.com/mheese/journalbeat"; - - buildInputs = [ makeWrapper pkgs.systemd ]; - - postInstall = '' - wrapProgram $bin/bin/journalbeat \ - --argv0 journalbeat \ - --prefix LD_LIBRARY_PATH : ${libPath} - ''; - src = fetchFromGitHub { owner = "mheese"; repo = "journalbeat"; @@ -26,6 +11,14 @@ in buildGoPackage rec { sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a"; }; + goPackagePath = "github.com/mheese/journalbeat"; + + buildInputs = [ systemd.dev ]; + + postFixup = let libPath = lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; + meta = with lib; { homepage = https://github.com/mheese/journalbeat; description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch"; |