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

pcsxr: remove name conflict with zlib 1.2.9 #23482

Merged
merged 1 commit into from Mar 6, 2017
Merged

pcsxr: remove name conflict with zlib 1.2.9 #23482

merged 1 commit into from Mar 6, 2017

Conversation

rardiol
Copy link
Contributor

@rardiol rardiol commented Mar 4, 2017

Motivation for this change

zlib 1.2.9 added a uncompress2 function that conflicts

and #23253

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

@Mic92 Mic92 merged commit c31c11e into NixOS:master Mar 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants