mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge pull request #12373 from nathan7/docker-journald
docker: enable journald support
This commit is contained in:
commit
a224badfea
@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, makeWrapper
|
||||
, go, sqlite, iproute, bridge-utils, devicemapper
|
||||
, btrfs-progs, iptables, e2fsprogs, xz, utillinux
|
||||
, systemd, pkgconfig
|
||||
, enableLxc ? false, lxc
|
||||
}:
|
||||
|
||||
@ -21,11 +22,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs
|
||||
iptables e2fsprogs
|
||||
iptables e2fsprogs systemd pkgconfig
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
DOCKER_BUILDTAGS = [ "journald" ];
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs .
|
||||
export AUTO_GOPATH=1
|
||||
|
Loading…
Reference in New Issue
Block a user