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

Fixed broken swiftshader #109653

Closed
wants to merge 1 commit into from
Closed

Fixed broken swiftshader #109653

wants to merge 1 commit into from

Conversation

katyo
Copy link

@katyo katyo commented Jan 17, 2021 •
edited

Motivation for this change

Vulkan API via google's swiftshader

Things done
  • Revision updated to 2020-01-17
  • Added zlib to buildInputs
  • The vulkaninfo util shows device info
  • The vkcube program also works fine
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Synthetica9
Copy link
Member

The preferred commit message would be "swiftshader: 2020-06-17 -> 2021-01-17"

prusnak
prusnak requested changes Jan 17, 2021
View reviewed changes
pkgs/development/libraries/swiftshader/default.nix

stdenv.mkDerivation rec {
pname = "swiftshader";
version = "2020-06-17";
version = "2021-01-17";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
version = "2021-01-17";
version = "unstable-2021-01-17";

@prusnak
Copy link
Member

prusnak commented Jan 17, 2021

The preferred commit message would be "swiftshader: 2020-06-17 -> 2021-01-17"

swiftshader: 2020-06-17 -> unstable-2021-01-17

@prusnak
Copy link
Member

prusnak commented Jan 17, 2021

Please resolve the merge conflict.

@katyo katyo closed this Jan 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prusnak prusnak prusnak requested changes

Assignees
No one assigned
Labels
2.status: merge conflict
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@katyo @Synthetica9 @prusnak