From 3d2948e00968feceb35688be268402709fc466ea Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 19 Jan 2018 11:26:59 -0500 Subject: [PATCH] docker: Fix build after containerd update --- pkgs/applications/virtualization/docker/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4c0adbb9bf..e5f5adff1d1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -39,13 +39,6 @@ rec { hardeningDisable = [ "fortify" ]; buildInputs = [ removeReferencesTo go btrfs-progs ]; - - # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' - export GOPATH=$(pwd)/vendor - mkdir $(pwd)/vendor/src - mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - '' + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec {