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

Jump to bottom

addOpenGLRunpath: only apply to ELF files #61973

Merged
merged 1 commit into from May 24, 2019
Merged

addOpenGLRunpath: only apply to ELF files #61973

merged 1 commit into from May 24, 2019

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented May 23, 2019 •
edited

Motivation for this change

Fix/workaround for #61921

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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @ambrop72

@veprbl veprbl requested a review from abbradar May 23, 2019 20:55
@veprbl
Copy link
Member Author

veprbl commented May 23, 2019

@GrahamcOfBorg build libglvnd

@veprbl
Copy link
Member Author

veprbl commented May 23, 2019

Error on darwin is transient, it does build locally.

@veprbl veprbl merged commit 643a439 into master May 24, 2019
@flokli
Copy link
Contributor

flokli commented May 24, 2019

How come this alone fixes it?

I was assuming the .so files don't exist on darwin:

https://github.com/NixOS/nixpkgs/pull/60985/files#diff-9179be247d2ec19fbbf4b85e1ac99692R49

@flokli flokli deleted the pr/fix_libglvnd branch May 24, 2019 21:41
@ambrop72
Copy link
Contributor

A nonexisting path gets passed to addOpenGLRunpath (possibly an unexpanded glob) and isELF returns false?

@abbradar
Copy link
Member

Ah, yes, that happens because these files don't exist - thanks for the fix!. Also, TIL libglvnd builds on Darwin - what purpose does it serve there?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@veprbl @flokli @ambrop72 @abbradar @matthewbauer