public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94354 from flokli/systemd-246

Browse Source 
systemd: 245.6 -> 246
This commit is contained in:
Florian Klink
2020-08-24 12:42:24 +02:00
committed by GitHub
parent 6d122d67fa 618e273861
commit 40d2968ebf
66 changed files with 287 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/logging/beats/6.x.nix
View File

@@ -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"
'';
};

4
pkgs/misc/logging/beats/7.x.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
let beat = package : extraArgs : buildGoPackage (rec {
name = "${package}-${version}";
@@ -45,7 +45,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"
'';
};