nix: fix cross-build failure by disabling s3-aws-auth #468205
Merged
+8
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
the
6.topic: cross-compilation
nixpkgs-ci
bot
requested review from
Mic92,
Radvendii,
RaitoBezarius,
edolstra,
tomberek and
xokdvium
nixpkgs-ci
bot
added
10.rebuild-linux: 1-10
Ericson2314
approved these changes
Dec 5, 2025
Member
Ericson2314
left a comment
Ericson2314
left a comment
There was a problem hiding this comment.
Can you send the same diff to upstream Nix?
nixpkgs-ci
bot
added
the
12.approvals: 1
corngood
force-pushed
the
nix-cross-fix
branch
from
5df771a to
c927d0e
Compare
Contributor
Author
There was already something like this upstream, so I tried to match it as closely as possible, while keeping the versioning support. |
Member
|
|
Ericson2314
reviewed
Dec 5, 2025
| (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) | ||
| (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) | ||
| ] | ||
| ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") ( |
Contributor
Author
There was a problem hiding this comment.
That option got renamed at the same time and doesn't exist before 2.33, so I thought this was best.
|
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I think this became a problem with:
NixOS/nix@ffbc33f
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.