diff options
| author | Nick Cao <nickcao@nichi.co> | 2021-05-26 23:53:52 +0800 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-05-30 11:38:17 +1000 |
| commit | e1d59ae8d4c839542607b76218bd9a66ce3f4e20 (patch) | |
| tree | 89a9a5b190f9097a058a43efc71b5e841d1eb3fa /pkgs/applications | |
| parent | 6ab535aade04127f151570c43922f3472da2c2a7 (diff) | |
Revert "podman: add systemd to LD_LIBRARY_PATH for journald log driver"
This reverts commit b71086499de8644780bbe59dd31d1eb3d04f3c06.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index beaeb890a1958..c8b8467def5c1 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pkg-config , installShellFiles -, makeWrapper , buildGoModule , gpgme , lvm2 @@ -37,7 +36,7 @@ buildGoModule rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs @@ -70,8 +69,6 @@ buildGoModule rec { installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild '' + lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/podman \ - --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system '' + '' |