summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-05-27 15:41:05 +0100
committerobadz <obadz-git@obadz.com>2016-05-27 15:42:15 +0100
commitf0de1c75b5241544eb80e05a0ed60acc6a1e27f8 (patch)
tree8bf3cfe6cdfdba01c3ab1d4cc4bed05656e3cc7a /pkgs/applications/virtualization
parentf7e7b814a95641e93543647c8777edaf16b17541 (diff)
downloadnixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.tar
nixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.tar.gz
nixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.tar.bz2
nixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.tar.lz
nixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.tar.xz
nixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.tar.zst
nixpkgs-f0de1c75b5241544eb80e05a0ed60acc6a1e27f8.zip
docker: fix build with systemd 230
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 6260de54594..961a78eebe5 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