Skip to content

Try to fix #7669#7670

Merged
roberth merged 1 commit intoNixOS:masterfrom
obsidiansystems:try-fix-7669
Jan 24, 2023
Merged

Try to fix #7669#7670
roberth merged 1 commit intoNixOS:masterfrom
obsidiansystems:try-fix-7669

Conversation

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jan 23, 2023

Motivation

The issue seems to be the cross jobs, which are missing the CXXFLAGS needed to get rapidcheck.

Maybe fixes #7669

Context

PR #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.

Checklist for maintainers

Maintainers: tick if completed or explain if not relevant

  • agreed on idea
  • agreed on implementation strategy
  • tests, as appropriate
    • functional tests - tests/**.sh
    • unit tests - src/*/tests
    • integration tests
  • documentation in the manual
  • code and comments are self-explanatory
  • commit message explains why the change was made
  • new feature or bug fix: updated release notes

flake.nix Outdated

configureFlags = [ "--sysconfdir=/etc" "--disable-doc-gen" ];
configureFlags = [
"CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this line be removed from the commonDeps.configureFlags then? Or are they both necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I saw they were separate places, I just didn't realize they were both necessary.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cole-h If you feel inspired to fix the conflicts in that PR by any chance, I would very much appreciate it :).

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.
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As said, #6538 or similar is needed to fix the tech debt, but let's first fix the build.
(confirmed with nix build github:obsidiansystems/nix/try-fix-7669#nix-armv7l-linux)

@github-actions
Copy link

Successfully created backport PR for 2.13-maintenance:

@Ericson2314 Ericson2314 deleted the try-fix-7669 branch January 24, 2023 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Broken CI jobs after rapidcheck

3 participants