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

lsof: replace impure reference to /usr/include files #22217

Merged
merged 1 commit into from Jan 29, 2017
Merged

lsof: replace impure reference to /usr/include files #22217

merged 1 commit into from Jan 29, 2017

Conversation

adnelson
Copy link
Contributor

Motivation for this change

A change back in October was supposed to have fixed lsof for OSX, but when I tried to build it myself I got it failing trying to find /usr/include/string.h, so it looks like this impurity was being hidden. I fix this here with sed. In addition, rather than setting LSOF_INCLUDE in the configure phase, I include it as an argument to mkDerivation which is more standard.

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.

@mention-bot
Copy link

@adnelson, thanks for your PR! By analyzing the history of the files in this pull request, we identified @7c6f434c, @jhhuh and @edolstra to be potential reviewers.

@7c6f434c 7c6f434c merged commit 71fa504 into NixOS:master Jan 29, 2017
@fpletz fpletz added the 6.topic: darwin Running or building packages on Darwin label Feb 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevincox kevincox kevincox approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@adnelson @mention-bot @kevincox @fpletz @7c6f434c