diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-15 00:54:55 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-15 00:54:55 +0100 |
| commit | a224badfea835bcb8e3d94c4a4cf29e361b3dfe9 (patch) | |
| tree | 70cb5d6674c2a4c277c0742d337a7db692d2d47a /pkgs/applications/virtualization | |
| parent | 5876238d5439d3d1935fc3e80cfe1a21470a20f7 (diff) | |
| parent | 9c9a5353f97e17d055a4197d97cc85724059a50b (diff) | |
| download | nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.tar nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.tar.gz nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.tar.bz2 nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.tar.lz nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.tar.xz nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.tar.zst nixlib-a224badfea835bcb8e3d94c4a4cf29e361b3dfe9.zip | |
Merge pull request #12373 from nathan7/docker-journald
docker: enable journald support
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1d9b1737f652..31daedd6d1eb 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -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 |