Try to fix #7669 #7670
Merged
Try to fix #7669 #7670
Conversation
This file contains 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
cole-h
reviewed
Jan 23, 2023
flake.nix
Outdated
| @@ -665,7 +665,11 @@ | |||
| nativeBuildInputs = nativeBuildDeps; | |||
| buildInputs = buildDeps ++ propagatedDeps; | |||
|
|
|||
| configureFlags = [ "--sysconfdir=/etc" "--disable-doc-gen" ]; | |||
| configureFlags = [ | |||
| "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include" | |||
There was a problem hiding this comment.
Should this line be removed from the commonDeps.configureFlags then? Or are they both necessary?
There was a problem hiding this comment.
See the linked PR. We have a completely separate mkDerivation for cross and static today, it's gross. The cross one happens to not use this flag.
There was a problem hiding this comment.
Ah, I saw they were separate places, I just didn't realize they were both necessary.
There was a problem hiding this comment.
@cole-h If you feel inspired to fix the conflicts in that PR by any chance, I would very much appreciate it :).
Ericson2314
force-pushed
the
try-fix-7669
branch
from
3542207
to
836daad
Compare
The issue *seems* to be the cross jobs, which are missing the `CXXFLAGS` needed to get rapidcheck. PR NixOS#6538 would be really nice to resurrect which will prevent the `configureFlags` from going out of sync between the regular build and the cross build again.
Ericson2314
force-pushed
the
try-fix-7669
branch
from
836daad
to
a91709a
Compare
roberth
added
the
backport 2.13-maintenance
|
Successfully created backport PR for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
The issue seems to be the cross jobs, which are missing the
CXXFLAGSneeded to get rapidcheck.Maybe fixes #7669
Context
PR #6538 would be really nice to resurrect which will prevent the
configureFlagsfrom going out of sync between the regular build and the cross build again.Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/tests