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

Mark wayland broken on Darwin/Big Sur #123686

Merged
merged 1 commit into from May 20, 2021
Merged

Mark wayland broken on Darwin/Big Sur #123686

merged 1 commit into from May 20, 2021

Conversation

edude03
Copy link
Contributor

@edude03 edude03 commented May 19, 2021

Motivation for this change

ZHF: #122042, ping @NixOS/nixos-release-managers

As mentioned in the comment, it seems like in the work @thefloweringash & co did to get nixpkgs working on Big Sur means that apps that need GCC to build no longer work (like Wayland). Maybe there is a way to bring support back, but at least for now it's broken.

On a side note, is there a way to check if stdenv is using clang or gcc? maybe a better check would be to check for clang instead.

Also, it does seem like GCC does work on big sur now https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97865 so maybe we can fix this.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

To comply with CONTRIBUTING.md please have the commit message name be of the format

<pkg-name>: <subject-line>

for more examples, please look at https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

in your case, the commit message should be:

wayland: mark broken for darwin

also, in the commit message, can you add some details. The code comment should suffice :)

pkgs/development/libraries/wayland/default.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

Do you mind squashing the two commits?

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

git rebase -i is a powerful command which achieves this, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

thanks @edude03

@jonringer jonringer merged commit c5ef875 into NixOS:master May 20, 2021
@edude03
Copy link
Contributor Author

edude03 commented May 20, 2021

Thanks @jonringer - although I do know how to rebase, I still really appreciate you linking to resources in case I didn't. I think it's really welcoming to new members of the community

@jonringer
Copy link
Contributor

I still really appreciate you linking to resources in case I didn't.

I had someone ask once, so just made a saved reply explaining it :)

@emilytrau
Copy link
Member

Does this still apply? I was able to compile wayland without issue.

> nix-build . -A wayland
/nix/store/zmc8q7qf5z4vyqs5rzj5jxd7gilcmjkf-wayland-1.19.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants