diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-01-19 11:26:59 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-01-19 11:26:59 -0500 |
| commit | 3d2948e00968feceb35688be268402709fc466ea (patch) | |
| tree | 101356dac18c8086f2c96e09bd4764ba8a2bdfb0 | |
| parent | ca016b63dce6a2605aa77d0ad6062289dae27e75 (diff) | |
| download | nixlib-3d2948e00968feceb35688be268402709fc466ea.tar nixlib-3d2948e00968feceb35688be268402709fc466ea.tar.gz nixlib-3d2948e00968feceb35688be268402709fc466ea.tar.bz2 nixlib-3d2948e00968feceb35688be268402709fc466ea.tar.lz nixlib-3d2948e00968feceb35688be268402709fc466ea.tar.xz nixlib-3d2948e00968feceb35688be268402709fc466ea.tar.zst nixlib-3d2948e00968feceb35688be268402709fc466ea.zip | |
docker: Fix build after containerd update
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4c0adbb9bf9..e5f5adff1d1d 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 { |