docker: fix docker_17_06 build

Broken by #29843
2017-09-28 05:09:54 +00:00 · 2017-09-28 05:09:54 +00:00 · f1ffca9ac6
commit f1ffca9ac6
parent ac6bb506c6
1 changed files with 2 additions and 3 deletions
--- 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";