From 8ccbb4747e9ea0e8c05730d512f1ba36a6cd427a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:18:40 +0200 Subject: filebeat6: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. --- pkgs/misc/logging/beats/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc/logging') diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index c3bca18a9a44..2d01ea622612 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; -- cgit 1.4.1