From e1d59ae8d4c839542607b76218bd9a66ce3f4e20 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 26 May 2021 23:53:52 +0800 Subject: Revert "podman: add systemd to LD_LIBRARY_PATH for journald log driver" This reverts commit b71086499de8644780bbe59dd31d1eb3d04f3c06. --- pkgs/applications/virtualization/podman/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/applications/virtualization/podman') 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 '' + '' -- cgit 1.4.1