Conversation
- Conditionalize glibcLocales (Linux only) - Fix nested function in zauth_module.c (not supported by Clang) - Skip system-linux-proc tests on macOS (/proc doesn't exist) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
zebot
added
the
ok-to-test
supersven
requested changes
Feb 6, 2026
|
|
||
| static ngx_int_t zauth_token_var (ngx_http_request_t * r, ngx_http_variable_value_t * v, uintptr_t data) { | ||
| ZauthContext const * ctx = ngx_http_get_module_ctx(r, zauth_module); | ||
| // this function checks if the signature has been validated successfully, |
Contributor
There was a problem hiding this comment.
Have you considered to use Nix's gccStdenv? You may try to override it here: https://github.com/wireapp/wire-server/blob/develop/nix/default.nix#L14-L14
E.g.
nginz = pkgs.callPackage ./nginz.nix { stdenv = pkgs.gccStdenv };
This would save us the headache to 💯 ensure that this introduces no regression. 😸
The zauth nginx module uses GCC nested functions, which are not supported by Clang (the default compiler on macOS). Instead of refactoring the C source to remove nested functions, use gccStdenv to ensure GCC is used for the nginz build on Darwin.
supersven
reviewed
Feb 16, 2026
| template = hlib.markUnbroken hsuper.template; | ||
| system-linux-proc = hlib.markUnbroken hsuper.system-linux-proc; | ||
| # /proc doesn't exist on macOS, so skip tests there | ||
| system-linux-proc = (if stdenv.isDarwin then hlib.dontCheck else (x: x)) |
Contributor
There was a problem hiding this comment.
The consequence of this is that you won't be able to run the integration tests. However, I guess, you could live with that?
Contributor
Author
There was a problem hiding this comment.
yes I think currently it's acceptable on MacOS - but would be nice to get this working in a next step 😄
supersven
approved these changes
Feb 17, 2026
blackheaven
pushed a commit
that referenced
this pull request
Feb 23, 2026
* nix: Fix devEnv build on macOS - Conditionalize glibcLocales (Linux only) - Skip system-linux-proc tests on macOS (/proc doesn't exist) - use gccStdenv to ensure GCC is used for the nginz build on Darwin.
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
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.
Summary
glibcLocalesto Linux only (not available on Darwin)gccStdenvfor thenginzbuild on macOS — the zauth nginx module uses GCC nested functions, which Clang doesn't support. This avoids modifying C source code.system-linux-proctests on macOS since/procfilesystem doesn't existTest plan
nix build .#nginzsucceeds on macOSnix developbuilds successfully on macOS