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.

Sign up for GitHub

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

Jump to bottom

xorg.xorgserver: fix build by adding mesa_noglu for dri package #40438

Merged
merged 1 commit into from May 13, 2018
Merged

xorg.xorgserver: fix build by adding mesa_noglu for dri package #40438

merged 1 commit into from May 13, 2018

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented May 13, 2018 •
edited

Motivation for this change

cc @abbradar

currently our xorgserver build is broken. I have not spot the actual change that broke the commit,
but it looks to me like it is related to the libglvnd change.
I am not sure if adding this package is the right thing to do.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS (according to ofBorg)
    • 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/)
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 changed the title xorgserver: add mesa_noglu for dri package xorgserver: fix build by adding mesa_noglu for dri package May 13, 2018
@Mic92 Mic92 changed the title xorgserver: fix build by adding mesa_noglu for dri package xorg.xorgserver: fix build by adding mesa_noglu for dri package May 13, 2018
@Mic92
Copy link
Member Author

Mic92 commented May 13, 2018

@GrahamcOfBorg build xorg.xorgserver

@Mic92
Copy link
Member Author

Mic92 commented May 13, 2018

Current hydra status: https://hydra.nixos.org/build/74046691/nixlog/1

checking for gcry_md_open in -lgcrypt... no
checking for SHA1_Init in -lcrypto... yes
checking for OPENSSL... yes
checking for SHA1 implementation... libcrypto
checking for XSERVERCFLAGS... no
configure: error: Package requirements (fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0 xproto >= 7.0.31 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 pixman-1 >= 0.27.2 videoproto compositeproto >= 0.4 recordproto >= 1.13.99.1 scrnsaverproto >= 1.1 resourceproto >= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 presentproto >= 1.0 xineramaproto xkbfile  pixman-1 >= 0.27.2 xfont2 >= 2.0.0 xau libsystemd >= 209 xshmfence >= 1.1 xdmcp) were not met:

No package 'dri' found

Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS
and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
builder for '/nix/store/wqipw08dy0dhqs58n1wpd3yaxlwcildd-xorg-server-1.19.6.drv' failed with exit code 1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: xorg.xorgserver

Partial log (click to expand)

copying path '/nix/store/30gji627150ii5nzl9clh7gzkb2ym6cn-apple-framework-CoreServices' from 'https://cache.nixos.org'...
copying path '/nix/store/2gwyz8nh8bkr0ncws5dxw17y3ah5pqks-apple-lib-xpc' from 'https://cache.nixos.org'...
copying path '/nix/store/bpy9jaq47ndxz1bibss7d8q7j7sspj0i-apple-framework-IOSurface' from 'https://cache.nixos.org'...
copying path '/nix/store/mn1m357hmxh6w3wvpwf6qwi0z79i8b3p-apple-framework-CoreGraphics' from 'https://cache.nixos.org'...
copying path '/nix/store/ff5ic7wzd711nzvn1k2232k5hrwnm9n6-apple-framework-CoreText' from 'https://cache.nixos.org'...
copying path '/nix/store/b3bmvjazj0advcxck5fx1cqyfvf1xblq-apple-framework-ImageIO' from 'https://cache.nixos.org'...
copying path '/nix/store/9szr7ia76n34kvs6iwv9zvd3xmbhfv6q-apple-framework-ApplicationServices' from 'https://cache.nixos.org'...
copying path '/nix/store/mip6m99gl0d3n1dc5d4axc6lmb26j5hg-apple-framework-Foundation' from 'https://cache.nixos.org'...
copying path '/nix/store/3yp2c2jwsg6n86gmd2w0g54pljm0sc8a-xorg-server-1.18.4' from 'https://cache.nixos.org'...
/nix/store/3yp2c2jwsg6n86gmd2w0g54pljm0sc8a-xorg-server-1.18.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xorg.xorgserver

Partial log (click to expand)

gzipping man pages under /nix/store/vmx2skp6jq3yqqcpa0irrx878f1xnygp-xorg-server-1.19.6/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vmx2skp6jq3yqqcpa0irrx878f1xnygp-xorg-server-1.19.6/lib  /nix/store/vmx2skp6jq3yqqcpa0irrx878f1xnygp-xorg-server-1.19.6/bin
patching script interpreter paths in /nix/store/vmx2skp6jq3yqqcpa0irrx878f1xnygp-xorg-server-1.19.6
checking for references to /build in /nix/store/vmx2skp6jq3yqqcpa0irrx878f1xnygp-xorg-server-1.19.6...
shrinking RPATHs of ELF executables and libraries in /nix/store/4y2097q602kav0vj7mzsk93kjl7zvvf0-xorg-server-1.19.6-dev
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4y2097q602kav0vj7mzsk93kjl7zvvf0-xorg-server-1.19.6-dev/lib
patching script interpreter paths in /nix/store/4y2097q602kav0vj7mzsk93kjl7zvvf0-xorg-server-1.19.6-dev
checking for references to /build in /nix/store/4y2097q602kav0vj7mzsk93kjl7zvvf0-xorg-server-1.19.6-dev...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xorg.xorgserver

Partial log (click to expand)

strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/whn34q7xhw22qcsgp26xgqvy956dpwv7-xorg-server-1.19.6/lib  /nix/store/whn34q7xhw22qcsgp26xgqvy956dpwv7-xorg-server-1.19.6/bin
patching script interpreter paths in /nix/store/whn34q7xhw22qcsgp26xgqvy956dpwv7-xorg-server-1.19.6
checking for references to /build in /nix/store/whn34q7xhw22qcsgp26xgqvy956dpwv7-xorg-server-1.19.6...
shrinking RPATHs of ELF executables and libraries in /nix/store/36dspjrw8ahngdwhh3z7kcklnc79c66r-xorg-server-1.19.6-dev
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/36dspjrw8ahngdwhh3z7kcklnc79c66r-xorg-server-1.19.6-dev/lib
patching script interpreter paths in /nix/store/36dspjrw8ahngdwhh3z7kcklnc79c66r-xorg-server-1.19.6-dev
checking for references to /build in /nix/store/36dspjrw8ahngdwhh3z7kcklnc79c66r-xorg-server-1.19.6-dev...
/nix/store/whn34q7xhw22qcsgp26xgqvy956dpwv7-xorg-server-1.19.6

@matthewbauer
Copy link
Member

This comes from my attempto get xquartz to build. The prpnlem is mesa_noglu is Linux only & we don’t have a compat library for it like libGL that works on macOS

@Mic92 Mic92 merged commit 8cdbdfb into NixOS:master May 13, 2018
@Mic92
Copy link
Member Author

Mic92 commented May 13, 2018

I left the macOS build unchanged.

@Mic92 Mic92 deleted the xorgserver branch May 13, 2018 18:34
@vcunat
Copy link
Member

vcunat commented May 13, 2018

Right, this regressed in c839771 due to libGL not providing dri.pc and friends. I just arrived at the same solution independently :-)

@vcunat vcunat mentioned this pull request May 13, 2018
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Mic92 @GrahamcOfBorg @matthewbauer @vcunat