nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-15 02:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "podman: add systemd to LD_LIBRARY_PATH for journald log driver"

Browse Source 
This reverts commit b71086499d.
This commit is contained in:
Nick Cao 2021-05-26 23:53:52 +08:00 committed by zowoq
parent 6ab535aade
commit e1d59ae8d4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/virtualization/podman/default.nix
View File

@ -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
'' + ''