Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing include in util.cc #5225

Merged
merged 1 commit into from
Sep 8, 2021
Merged

Add missing include in util.cc #5225

merged 1 commit into from
Sep 8, 2021

Conversation

ncfavier
Copy link
Member

@ncfavier ncfavier commented Sep 8, 2021

The clang build error that #5197 was trying to fix seems to be caused by a missing <array> header in util.cc (cc @andir #5075).

This is completely untested but should be obvious enough.

@happysalada
Copy link
Contributor

I'm starting a local darwin build, I'll update with the results when it's done (my machine is quite old, this might take some time).

@ncfavier
Copy link
Member Author

ncfavier commented Sep 8, 2021

Test failure unrelated.

@happysalada
Copy link
Contributor

Yeah I was having a look and it doesn't seem to be related to this.
What gives me hope is that the compilation went ahead until the end.

@happysalada
Copy link
Contributor

The build is just finished and it worked like a charm!
great job on finding this fix!

❯ ./result/bin/nix --version
nix (Nix) 2.4pre20210908_7f0d177

if you want to make a PR on nixpkgs that includes this patch, I'm happy to review it and merge it.
we can also wait a couple of days for upstream if you want.

@ncfavier
Copy link
Member Author

ncfavier commented Sep 8, 2021

I'm fine with waiting. I expect this to be merged quickly anyway

@edolstra edolstra merged commit 3c56f62 into NixOS:master Sep 8, 2021
@ncfavier ncfavier deleted the patch-1 branch September 8, 2021 12:31
@edolstra
Copy link
Member

edolstra commented Sep 8, 2021

Thanks!

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.

3 participants