diff options
| author | Sascha Grunert <sgrunert@redhat.com> | 2021-11-09 09:41:42 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-11-12 11:08:25 -0500 |
| commit | e456873c02e023db1dc012fbf64e45a76ebc467f (patch) | |
| tree | 3a306702e1197a39d79638e5896517895547accb /nix | |
| parent | e9f6e5194c491f01617763c02a0d8abd0cf02e79 (diff) | |
| download | podman-e456873c02e023db1dc012fbf64e45a76ebc467f.tar.gz podman-e456873c02e023db1dc012fbf64e45a76ebc467f.tar.bz2 podman-e456873c02e023db1dc012fbf64e45a76ebc467f.zip | |
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 <sgrunert@redhat.com>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default-arm64.nix | 3 | ||||
| -rw-r--r-- | nix/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix index 8868788ae..a38cef04a 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 4d15532c2..9a4b372a4 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; |