diff options
| author | Ryan Burns <rburns@ganymede.caltech.edu> | 2020-09-19 00:10:11 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-09-19 20:29:26 -0700 |
| commit | 9d58eb47f2c888cee983b1cbe26b249d75d95a53 (patch) | |
| tree | 0820c0998a257609abc0304472037b8324e299ff /pkgs/applications/virtualization | |
| parent | a5f77e0583c81426c8759210256fbe2951a524d1 (diff) | |
| download | nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.tar nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.tar.gz nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.tar.bz2 nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.tar.lz nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.tar.xz nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.tar.zst nixpkgs-9d58eb47f2c888cee983b1cbe26b249d75d95a53.zip | |
docker_18_09: fix build
The cross-compilation patch introduced in https://github.com/NixOS/nixpkgs/pull/92140 fixes an issue introduced in Docker CE 19.03, and will not apply to (and is not needed for) previous versions.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 78d6631c2dc..14cfa7b3120 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -79,7 +79,7 @@ rec { sha256 = sha256; }; - patches = [ + patches = lib.optional (versionAtLeast version "19.03") [ # Replace hard-coded cross-compiler with $CC (fetchpatch { url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; |