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

mtools: fix build on darwin #24559

Merged
merged 1 commit into from Apr 4, 2017
Merged

mtools: fix build on darwin #24559

merged 1 commit into from Apr 4, 2017

Conversation

georgewhewell
Copy link
Contributor

Motivation for this change

mtools fails to build on darwin

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

@georgewhewell, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @peti and @bjornfor to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Apr 4, 2017

# fails to find X on darwin
configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";

doCheck = true;

meta = {
Copy link
Member

Choose a reason for hiding this comment

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

You should update the meta.platforms to include darwin

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, added

@LnL7 LnL7 merged commit 2aeafc1 into NixOS:master Apr 4, 2017
@copumpkin
Copy link
Member

copumpkin commented Apr 4, 2017

In future, I'd guard this on stdenv.cc.isClang rather than isDarwin, since I think that's the actual issue, right?

@georgewhewell georgewhewell deleted the mtools-darwin branch April 5, 2017 09:10
@georgewhewell
Copy link
Contributor Author

@copumpkin correct- had I known about cc.isClang function I would have used it to guard patch- don't know if X11 failure is due to clang or darwin though. Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants