Merge pull request #119242 from sternenseemann/docker-cross

docker: move makeWrapper to nativeBuildInputs
This commit is contained in:
Sandro
2021-04-12 20:04:22 +02:00
committed by GitHub
@@ -132,10 +132,10 @@ rec {
goPackagePath = "github.com/docker/cli"; goPackagePath = "github.com/docker/cli";
nativeBuildInputs = [ pkg-config go-md2man go libtool installShellFiles ]; nativeBuildInputs = [
buildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles
makeWrapper ];
] ++ optionals (stdenv.isLinux) [ buildInputs = optionals (stdenv.isLinux) [
sqlite lvm2 btrfs-progs systemd libseccomp sqlite lvm2 btrfs-progs systemd libseccomp
] ++ optionals (buildxSupport) [ docker-buildx ]; ] ++ optionals (buildxSupport) [ docker-buildx ];