From f0de1c75b5241544eb80e05a0ed60acc6a1e27f8 Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 27 May 2016 15:41:05 +0100 Subject: [PATCH] docker: fix build with systemd 230 --- pkgs/applications/virtualization/docker/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6260de54594b..961a78eebe52 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd + postPatch = '' + substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd + substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd + ''; + buildPhase = '' patchShebangs . export AUTO_GOPATH=1