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

Fixup from macos-10-12 branch #60447

Merged
merged 4 commits into from Apr 30, 2019
Merged

Fixup from macos-10-12 branch #60447

merged 4 commits into from Apr 30, 2019

Conversation

matthewbauer
Copy link
Member

Fixes some mistakes in my pr: #56744

/cc @dtzWill

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 nix-review --run "nix-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.

@matthewbauer
treewide: make -Wno-error flags clang-only
74c784a 
In 724e833, I was a little too aggressive in enabling these flags.
Many don’t work in gcc, and we should probably avoid settings them
widely. This makes those flags optional on isclang
@matthewbauer
nix: use llvm6 on clang
c82bb31 
nix-2.2.2 only works with libcxx 6. We should only set the stdenv to
clang when we are already using clang. Also, nixUnstable does support
libcxx 7.
@matthewbauer
jackaudio: reenable on darwin
6e7cc80 
Apply patch to fix darwin build.
@matthewbauer
fluidsynth: fix on darwin
c0c1d74
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 30, 2019
@matthewbauer matthewbauer changed the base branch from staging to staging-next April 30, 2019 14:06
@matthewbauer matthewbauer merged commit a3990c9 into NixOS:staging-next Apr 30, 2019
@thefloweringash thefloweringash mentioned this pull request May 18, 2019
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill Awaiting requested review from dtzWill

@lovek323 lovek323 Awaiting requested review from lovek323

@svanderburg svanderburg Awaiting requested review from svanderburg

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@bjornfor bjornfor Awaiting requested review from bjornfor

@aforemny aforemny Awaiting requested review from aforemny

@edolstra edolstra Awaiting requested review from edolstra

@viric viric Awaiting requested review from viric

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@matthewbauer