diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/misc/logging | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/misc/logging')
| -rw-r--r-- | nixpkgs/pkgs/misc/logging/beats/6.x.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/misc/logging/beats/7.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index 2d01ea622612..1be14ecec9b8 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -15,7 +15,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 465051d3726e..d7416731e636 100644 --- a/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -15,7 +15,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; |