summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlois Wohlschlager <alois1@gmx-topmail.de>2025-07-19 09:26:36 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2025-08-09 13:13:43 +0000
commitb625e6da534865fd1c2c67e2029cdabe686596ad (patch)
tree5ded6e0f8917b3a62822cb8b4144123993fc0413
parent[Backport release-25.05] ci/eval: reduce closure size (#432225) (diff)
downloadnixpkgs-b625e6da534865fd1c2c67e2029cdabe686596ad.tar.gz
capnproto: fix platform offset
Due to the wrong platform offset, buildPackages.capnproto would inappropriately depend on empty-libgcc_eh when building with dynamic build platform and static host platform. In turn the build would fail due to the archiver not being found. (cherry picked from commit 8b0263aba578e2fa611a528bedcfc5cf4d5a687c)
-rw-r--r--pkgs/by-name/ca/capnproto/package.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index fdfb91242503..59c8a631bc2b 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -45,7 +45,7 @@ clangStdenv.mkDerivation rec {
openssl
zlib
]
- ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.targetPlatform.isStatic) empty-libgcc_eh;
+ ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.hostPlatform.isStatic) empty-libgcc_eh;
# FIXME: separate the binaries from the stuff that user systems actually use
# This runs into a terrible UX issue in Lix and I just don't want to debug it