summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@redhat.com>2021-11-09 09:41:42 +0100
committerSascha Grunert <sgrunert@redhat.com>2021-11-09 09:44:56 +0100
commitd0b502fceabe0c98a3d2392af6ddb241b80dea61 (patch)
treedc3056d778a9d4660a0b587efdce601032d29257 /nix
parent3ccd999340462a5af62ac145c339d9c251721aec (diff)
downloadpodman-d0b502fceabe0c98a3d2392af6ddb241b80dea61.tar.gz
podman-d0b502fceabe0c98a3d2392af6ddb241b80dea61.tar.bz2
podman-d0b502fceabe0c98a3d2392af6ddb241b80dea61.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.nix3
-rw-r--r--nix/default.nix3
2 files changed, 4 insertions, 2 deletions
diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix
index bb958a193..fa076f27d 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 1dc6f92b6..30ae21503 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;