From e456873c02e023db1dc012fbf64e45a76ebc467f Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 9 Nov 2021 09:41:42 +0100 Subject: [PATCH] Exclude already built sources for static build We now do not copy the `bin` directory to the target nix sources to avoid skipping the build because "everything is up to date". Fixes https://github.com/containers/podman/issues/12198 Signed-off-by: Sascha Grunert --- nix/default-arm64.nix | 3 ++- nix/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix index 8868788ae1..a38cef04af 100644 --- a/nix/default-arm64.nix +++ b/nix/default-arm64.nix @@ -59,7 +59,8 @@ let self = with pkgs; buildGoModule rec { name = "podman"; - src = ./..; + src = builtins.filterSource + (path: type: !(type == "directory" && baseNameOf path == "bin")) ./..; vendorSha256 = null; doCheck = false; enableParallelBuilding = true; diff --git a/nix/default.nix b/nix/default.nix index 4d15532c22..9a4b372a46 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -57,7 +57,8 @@ let self = with pkgs; buildGoModule rec { name = "podman"; - src = ./..; + src = builtins.filterSource + (path: type: !(type == "directory" && baseNameOf path == "bin")) ./..; vendorSha256 = null; doCheck = false; enableParallelBuilding = true;