From 9d58eb47f2c888cee983b1cbe26b249d75d95a53 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 19 Sep 2020 00:10:11 -0700 Subject: [PATCH] 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. --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 78d6631c2dc0..14cfa7b3120c 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;