diff options
| author | Florian Klink <flokli@flokli.de> | 2020-08-24 12:42:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 12:42:24 +0200 |
| commit | 40d2968ebf3b2b4c547caaa776b6eb875e1e5f83 (patch) | |
| tree | e162a8e316931cc8eab5f0123dcbe76f24b21eea /pkgs/servers/monitoring | |
| parent | 6d122d67fa3ae31f36405ecad6bf0cbfc156ed79 (diff) | |
| parent | 618e273861f7eda1f04fd8909cbe066e75556070 (diff) | |
Merge pull request #94354 from flokli/systemd-246
systemd: 245.6 -> 246
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/loki/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index e6ecf5681f5e3..4e5c74c2a606b 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { version = "1.6.0"; @@ -25,7 +25,7 @@ buildGoPackage rec { preFixup = stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/promtail \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 506d334a921bc..c66373e92982c 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with stdenv.lib; @@ -44,7 +44,7 @@ buildGoPackage rec { postInstall = optionalString withSystemdSupport '' wrapProgram $out/bin/postfix_exporter \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; }; |