From f1ffca9ac606fc84c34e0003ce693009a1255a48 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 28 Sep 2017 05:09:54 +0000 Subject: [PATCH] docker: fix docker_17_06 build Broken by #29843 --- pkgs/applications/virtualization/docker/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f28ec6275b8..270a9be6eec 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -46,11 +46,10 @@ rec { }; # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' + preBuild = (optionalString (version == "17.09.0-ce") '' mkdir $(pwd)/vendor/src mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - ln -s $(pwd) vendor/src/github.com/containerd/containerd - ''; + '') + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init";