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

nixos/opengl: Don't set XDG_DATA_DIRS. #63894

Merged
merged 1 commit into from Jul 11, 2019
Merged

nixos/opengl: Don't set XDG_DATA_DIRS. #63894

merged 1 commit into from Jul 11, 2019

Conversation

ambrop72
Copy link
Contributor

This was added in #19936 so that vulkan-loader finds the ICD config files. It is
not needed any more after #62869 where it was ensured that the loader looks in
/run/opengl-driver(-32)/share.

Motivation for this change

Remove unnecessary setting of environment variable.

Things done

Tested that Vulkan (vulkaninfo, vkcube) still works with the following drivers: ati, amdgpu, intel, nvidia. I could not test amdgpu-pro because it's broken in nixos-unstable.

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

@ambrop72
nixos/opengl: Don't set XDG_DATA_DIRS.
c07fb9c 
This was added in NixOS#19936 so that vulkan-loader finds the ICD config files. It is
not needed any more after NixOS#62869 where it was ensured that the loader looks in
/run/opengl-driver(-32)/share.
worldofpeace
worldofpeace approved these changes Jul 4, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment •
edited

Choose a reason for hiding this comment

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

Sounds good, looks like your PR in mention was merged
🎊

@worldofpeace worldofpeace merged commit c924032 into NixOS:master Jul 11, 2019
@ambrop72
Copy link
Contributor Author

Thanks.

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

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ambrop72 @worldofpeace