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

bullet: fix darwin build #68963

Closed
wants to merge 1 commit into from
Closed

bullet: fix darwin build #68963

wants to merge 1 commit into from

Conversation

B4dM4n
Copy link
Contributor

@B4dM4n B4dM4n commented Sep 17, 2019

Motivation for this change

Fix darwin build for #68361.

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 nix-review --run "nix-review wip" (openrw still fails on macOS)
  • 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.
Notify maintainers

cc @aforemny

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Sep 17, 2019
@ofborg ofborg bot requested a review from aforemny September 17, 2019 13:47
@matthewbauer
Copy link
Member

@GrahamcOfBorg build bullet

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

nitpick

@@ -40,7 +40,10 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range";
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [
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
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
"-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"
];

Unlike eg. buildInputs NIX_* attributes are only used as environment variables which should be strings. While lists work sometimes it could lead to unexpected results.

@aforemny
Copy link
Contributor

Merged in 722d657 with the suggestion from @LnL7. Thanks @B4dM4n!

@aforemny aforemny closed this Sep 29, 2019
@B4dM4n B4dM4n deleted the bullet-darwin branch September 29, 2019 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants