JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker: move makeWrapper to nativeBuildInputs

Browse Source 
This fixes evaluation of docker when cross compiling. Reproducer:

```
nix-repl> (import ./. { crossOverlays = [ (_: _: {}) ]; }).docker
```

Fails on master, resolved with this PR.
This commit is contained in:
sternenseemann 2021-04-12 19:06:02 +02:00
parent 60e238f4c3
commit b126d5436a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/docker/default.nix
View File

@ -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 ];