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

Fix houdini (missing libGL) #40736

Merged
merged 1 commit into from May 18, 2018
Merged

Fix houdini (missing libGL) #40736

merged 1 commit into from May 18, 2018

Conversation

kwohlfahrt
Copy link
Contributor

Motivation for this change

Houdini included with unstable fails due to not being able to find libGL.so. This adds libGL as an explicit input to the runtime (I think this is correct, as of #37369).

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

@xeji xeji merged commit f07c44b into NixOS:staging May 18, 2018
xeji added a commit that referenced this pull request May 18, 2018
@xeji
Revert "houdini: Fix libGL (#40736)"
fc716e6 
This reverts commit f07c44b.
PR was incorrectly based on staging instead of master.
xeji pushed a commit that referenced this pull request May 18, 2018
@kwohlfahrt @xeji
houdini: Fix libGL (#40736)
13d55dd 
(cherry picked from commit f07c44b)
PR was incorrectly based on staging instead of master.
@xeji
Copy link
Contributor

xeji commented May 18, 2018 •
edited

Oops, I didn't catch that this should go to master, not staging.
Reverted on staging in fc716e6 and picked to master in 13d55dd.

@xeji
Copy link
Contributor

xeji commented May 18, 2018

@kwohlfahrt please base future pull requests on master (unless they cause a mass rebuild, in which case staging is correct).

@kwohlfahrt
Copy link
Contributor Author

kwohlfahrt commented May 19, 2018 •
edited

Sorry, I didn't realize. Will do in future. Thanks for merging :)

@kwohlfahrt kwohlfahrt deleted the houdini branch May 19, 2018 10:33
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: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kwohlfahrt @xeji @GrahamcOfBorg