git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "podman: add systemd to LD_LIBRARY_PATH for journald log driver"

This reverts commit b71086499de8644780bbe59dd31d1eb3d04f3c06.

commite1d59ae8d4c839542607b76218bd9a66ce3f4e20 authorNick Cao <nickcao@nichi.co> dateWed 26 May 2021, 23:53 (5 years ago) parent6ab535a
1 file changed+1−4
pkgs/applications/virtualization/podman/default.nix+1−4
pkgs/applications/virtualization/podman/default.nix+1−4
@@ -3,7 +3,6 @@
33, fetchFromGitHub
44, pkg-config
55, installShellFiles
6−, makeWrapper
76, buildGoModule
87, gpgme
98, lvm2
@@ -37,7 +36,7 @@ buildGoModule rec {
3736
3837 outputs = [ "out" "man" ];
3938
40− nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ];
39+ nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];
4140
4241 buildInputs = lib.optionals stdenv.isLinux [
4342 btrfs-progs
@@ -70,8 +69,6 @@ buildGoModule rec {
7069 installShellCompletion --zsh completions/zsh/*
7170 MANDIR=$man/share/man make install.man-nobuild
7271 '' + lib.optionalString stdenv.isLinux ''
73− wrapProgram $out/bin/podman \
74− --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
7572 install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
7673 install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
7774 '' + ''