nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12373 from nathan7/docker-journald

Browse Source 
docker: enable journald support
This commit is contained in:
Franz Pletz 2016-01-15 00:54:55 +01:00
commit a224badfea
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper { stdenv, fetchFromGitHub, makeWrapper
, go, sqlite, iproute, bridge-utils, devicemapper , go, sqlite, iproute, bridge-utils, devicemapper
, btrfs-progs, iptables, e2fsprogs, xz, utillinux , btrfs-progs, iptables, e2fsprogs, xz, utillinux
, systemd, pkgconfig
, enableLxc ? false, lxc , enableLxc ? false, lxc
}: }:
@ -21,11 +22,13 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs
iptables e2fsprogs iptables e2fsprogs systemd pkgconfig
]; ];
dontStrip = true; dontStrip = true;
DOCKER_BUILDTAGS = [ "journald" ];
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
export AUTO_GOPATH=1 export AUTO_GOPATH=1