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

mesa: more include fixes #43760

Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 18, 2018

mostly from void-linux (thanks!)

Fix build by adding some missing includes.

The following describes this commit on a slightly older (yesterday) branch,
because I was without internet all morning O:).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

mostly from void-linux (thanks!)
@dtzWill
Copy link
Member Author

dtzWill commented Jul 18, 2018

@GrahamcOfBorg build mesa_drivers

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: mesa_drivers

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: mesa_drivers

Partial log (click to expand)

  CC       nouveau_span.lo
  CC       nouveau_state.lo
  CC       nouveau_surface.lo
  CC       nouveau_texture.lo
  CC       nv04_context.lo
  CC       nv04_render.lo
  CC       nv04_state_fb.lo
  CC       nv04_state_frag.lo
building of '/nix/store/mkgvlja2if9sl1vk1dy5xr487va3yj5i-mesa-noglu-18.1.4.drv' timed out after 3600 seconds
error: build of '/nix/store/mkgvlja2if9sl1vk1dy5xr487va3yj5i-mesa-noglu-18.1.4.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: mesa_drivers

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/l038l6s0c7k94mqbyzyhjh5mg32kxsid-mesa-noglu-18.1.4-drivers/lib
patching script interpreter paths in /nix/store/l038l6s0c7k94mqbyzyhjh5mg32kxsid-mesa-noglu-18.1.4-drivers
checking for references to /build in /nix/store/l038l6s0c7k94mqbyzyhjh5mg32kxsid-mesa-noglu-18.1.4-drivers...
shrinking RPATHs of ELF executables and libraries in /nix/store/dcg6qa8x5dk8hqnajpf0d4idyamiwk1p-mesa-noglu-18.1.4-osmesa
shrinking /nix/store/dcg6qa8x5dk8hqnajpf0d4idyamiwk1p-mesa-noglu-18.1.4-osmesa/lib/libOSMesa.so.8.0.0
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dcg6qa8x5dk8hqnajpf0d4idyamiwk1p-mesa-noglu-18.1.4-osmesa/lib
patching script interpreter paths in /nix/store/dcg6qa8x5dk8hqnajpf0d4idyamiwk1p-mesa-noglu-18.1.4-osmesa
checking for references to /build in /nix/store/dcg6qa8x5dk8hqnajpf0d4idyamiwk1p-mesa-noglu-18.1.4-osmesa...
/nix/store/l038l6s0c7k94mqbyzyhjh5mg32kxsid-mesa-noglu-18.1.4-drivers

@dtzWill dtzWill merged commit 55aeb86 into NixOS:staging Jul 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants