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

geekbench{4,5}: use autoPatchelfHook and do not hardcode CUDA lib, geekbench6: init at 6.0.1 #220554

Merged
merged 6 commits into from
Mar 11, 2023
Merged

geekbench{4,5}: use autoPatchelfHook and do not hardcode CUDA lib, geekbench6: init at 6.0.1 #220554

merged 6 commits into from
Mar 11, 2023

Conversation

thiagokokada
Copy link
Contributor

@thiagokokada thiagokokada commented Mar 10, 2023 •
edited
Loading

Description of changes

Substitute PR for #220517.

Use autoPatchelfHook to avoid patching manually, and also remove NVIDIA drivers and instead add /run/opengl-driver/lib to the LD_LIBRARY_PATH.

Should make the whole derivation smaller in general, and also means you don't need to build the NVIDIA driver even if you don't have a NVIDIA GPU.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@thiagokokada
Copy link
Contributor Author

CC @superherointj.

superherointj
superherointj approved these changes Mar 10, 2023
View reviewed changes
Copy link
Contributor

@superherointj superherointj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better than I could have done.

@ofborg ofborg bot requested a review from michalrus March 10, 2023 21:42
@thiagokokada thiagokokada changed the title geekbench{4,5}: use autoPatchelfHook and addOpenGLRunpath, geekbench6: init at 6.0.1 geekbench{4,5}: use autoPatchelfHook, geekbench6: init at 6.0.1 Mar 10, 2023
@thiagokokada
Copy link
Contributor Author

@ofborg eval

@superherointj superherointj mentioned this pull request Mar 11, 2023
Closed
@thiagokokada thiagokokada changed the title geekbench{4,5}: use autoPatchelfHook, geekbench6: init at 6.0.1 geekbench{4,5}: use autoPatchelfHook and do not hardcode CUDA lib, geekbench6: init at 6.0.1 Mar 11, 2023
@thiagokokada thiagokokada merged commit fff9f6b into NixOS:master Mar 11, 2023
@thiagokokada thiagokokada deleted the geekbench-refactor branch March 11, 2023 10:36
@MGlolenstine MGlolenstine mentioned this pull request Mar 28, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NickCao NickCao NickCao left review comments

@superherointj superherointj superherointj approved these changes

@michalrus michalrus Awaiting requested review from michalrus

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 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.
3 participants
@thiagokokada @superherointj @NickCao