Merge pull request #94354 from flokli/systemd-246

systemd: 245.6 -> 246
2020-08-24 12:42:24 +02:00
parent 6d122d67fa 618e273861
commit 40d2968ebf
66 changed files with 287 additions and 281 deletions
@@ -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; {