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

meson: Patch out default boost search paths #100850

Merged

Conversation

@nh2
Copy link
Contributor

@nh2 nh2 commented Oct 17, 2020

Motivation for this change

Avoids impure builds on unsandboxed non-NixOS builds, see:
#86131 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@nh2 nh2 requested review from jtojnar and Ericson2314 Oct 17, 2020
@nh2 nh2 self-assigned this Oct 17, 2020
@jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Oct 17, 2020

Would not this path still be picked up https://github.com/mensinda/meson/blob/66d3747efef9343ce2d98d24fe9be47c2432a941/mesonbuild/dependencies/boost.py#L690? Or is the Nixpkgs’s compiler returning nothing?

Also this should go to staging.

@nh2
Copy link
Contributor Author

@nh2 nh2 commented Oct 17, 2020

Would not this path still be picked up https://github.com/mensinda/meson/blob/66d3747efef9343ce2d98d24fe9be47c2432a941/mesonbuild/dependencies/boost.py#L690? Or is the Nixpkgs’s compiler returning nothing?

It seems to work, I suspect that nixpkgs' gcc is patched enough for that. Concretely with this fix I get as expected:

Run-time dependency Boost (missing: filesystem, program_options, serialization, system, unit_test_framework) found: NO 

meson.build:104:0: ERROR: Dependency "boost" not found

Also this should go to staging.

Ah yes, done.

Avoids impure builds on unsandboxed non-NixOS builds, see:
NixOS#86131 (comment)
@nh2 nh2 force-pushed the issue-86131-meson-patch-out-boost-system-paths branch from 17cf8b8 to cc7ec80 Oct 17, 2020
@nh2 nh2 requested review from FRidh, jonringer, LnL7 and Mic92 as code owners Oct 17, 2020
@nh2 nh2 changed the base branch from master to staging Oct 17, 2020
@FRidh FRidh added this to WIP in Staging via automation Oct 20, 2020
@FRidh FRidh merged commit 70a924f into NixOS:staging Oct 20, 2020
19 of 20 checks passed
Staging automation moved this from WIP to Done Oct 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants