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

glfw: hardwire path to libGL.so.1 #47175

Merged
merged 1 commit into from Nov 17, 2018
Merged

glfw: hardwire path to libGL.so.1 #47175

merged 1 commit into from Nov 17, 2018

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Sep 22, 2018

Motivation for this change

glfw use direct path to dlopen'ing libGL, so let hardwire path to libGL.so.1 (aka libglvnd).
Fix #46423. Possible that glfw-2.x package need a similiar fix.

/cc @samueldr (possible this commit is candidate to release-18.09 branch)

PS I also update epoxy as part of work on #46423, which is subject of own PR

Things done
  • 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.

@avnik
Copy link
Contributor Author

avnik commented Sep 22, 2018

Looks, like it need to be fixed once more, and apply libGL hardwiring on non-darwin only.

@avnik
Copy link
Contributor Author

avnik commented Sep 22, 2018

Well, disregarding my last comment, it already have related !isDarwin, but invalidate some darwin packages anyway, look like ofBorg issue. /cc @grahamc

@samueldr
Copy link
Member

samueldr commented Sep 23, 2018 •
edited

Hi!

lib.optional, when false, will still change the environment when adding a new attribute. That is because lib.optionla returns an empty list. This sets preConfigure to [], which in turn, in bash, will be preConfigure=. The glfw derivation did change for macOS, though largely a no-op.

As far as backporting to 18.09, I'm all for, assuming this is the right fix for the issue. Ping me for the backport after someone else with the OpenGL infrastructure knowledge has approved (and possibly merged) this PR. I'm not sure I know how to verify the validity of the change.

@Mic92
Copy link
Member

Mic92 commented Sep 24, 2018

maybe @lheckemann

@dtzWill
Copy link
Member

dtzWill commented Sep 29, 2018

Ping? Ran into it testing the zig 0.3 update (although it happens regardless of zig version I believe).

@andrewrk
Copy link
Member

Who or what is this blocking on?

@andrewrk
Copy link
Member

I confirm this fixes #46423 for me.

@Mic92 Mic92 merged commit 40449fe into NixOS:master Nov 17, 2018
@Mic92
Copy link
Member

Mic92 commented Nov 17, 2018

backport: 894a999

@andrewrk
Copy link
Member

Thanks!

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: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

glfw broken after move to libglvnd for opengl
6 participants
@avnik @samueldr @Mic92 @dtzWill @andrewrk @GrahamcOfBorg