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

Fix https://github.com/NixOS/nixpkgs/issues/117715 #117716

Merged
merged 2 commits into from Apr 30, 2021
Merged

Fix https://github.com/NixOS/nixpkgs/issues/117715 #117716

merged 2 commits into from Apr 30, 2021

Conversation

idontgetoutmuch
Copy link
Contributor

Motivation for this change

Fix #117715

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.

@idontgetoutmuch
Copy link
Contributor Author

This is really a placeholder

@idontgetoutmuch idontgetoutmuch marked this pull request as draft March 26, 2021 18:23
@collares
Copy link
Member

If you move the --without-x to the lib.optionalString stdenv.isDarwin-guarded string (a few lines below), is this still a placeholder/draft? It loooks OK to me.

omasanori
omasanori approved these changes Apr 30, 2021
View reviewed changes
Copy link
Contributor

@omasanori omasanori left a comment

Choose a reason for hiding this comment

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

The change seems valid. I think that it is OK to merge when it graduates from the draft status.

peti
peti approved these changes Apr 30, 2021
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

👍

@idontgetoutmuch idontgetoutmuch marked this pull request as ready for review April 30, 2021 06:41
@7c6f434c 7c6f434c merged commit ee4684f into NixOS:master Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti peti approved these changes

@omasanori omasanori omasanori approved these changes

@collares collares Awaiting requested review from collares

@timokau timokau Awaiting requested review from timokau

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

R fails to build with fatal error: 'cairo-xlib.h' file not found
5 participants
@idontgetoutmuch @collares @peti @omasanori @7c6f434c