Skip to content

ps2client: init at 2018-10-18 #52396

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
Merged
merged 1 commit into from
Apr 3, 2019
Merged

ps2client: init at 2018-10-18 #52396

merged 1 commit into from
Apr 3, 2019

Conversation

bignaux
Copy link

@bignaux bignaux commented Dec 16, 2018

Motivation for this change
Things done
  • 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 nox --run "nox-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.

@AndersonTorres AndersonTorres self-requested a review December 16, 2018 17:39
AndersonTorres
AndersonTorres reviewed Dec 16, 2018
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

I have seen that line on the upstream Makefile:

https://github.com/ps2dev/ps2client/blob/92fcaf18aabf74daaed40bd50d428cce326a87c0/Makefile#L6

Certainly it needs a local, Nix specific patch. That Makefile explicitly searches /usr/ in order to find include standard files, and it needs to be avoided.

I would suggest an inline sed script to get rid of that line - or at least the problematic -I/usr/include -I/usr/local/include part.

What do you think?

@GrahamcOfBorg GrahamcOfBorg added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 16, 2018
@bignaux
Copy link
Author

bignaux commented Dec 16, 2018

@GrahamcOfBorg build ps2client

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Dec 16, 2018
@GrahamcOfBorg GrahamcOfBorg added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Mar 27, 2019
@AndersonTorres AndersonTorres merged commit 84b7a76 into NixOS:master Apr 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndersonTorres AndersonTorres AndersonTorres left review comments

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bignaux @AndersonTorres @GrahamcOfBorg