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

webkitgtk: drop wayland dependency on Darwin #106070

Merged
merged 1 commit into from Dec 7, 2020
Merged

webkitgtk: drop wayland dependency on Darwin #106070

merged 1 commit into from Dec 7, 2020

Conversation

holymonson
Copy link
Contributor

Motivation for this change

I'm trying to build webkitgtk on Darwin, but it requires wayland, which is no need nor available on Darwin. So we may drop the dependency.

Things done

Make wayland required in nativeBuildInputs only on Linux.

@matthewbauer Would you please review this? I'm a newbee on Nix and not sure if it is right on this. Thanks.

  • 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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 6, 2020
jtojnar
jtojnar reviewed Dec 6, 2020
View reviewed changes
pkgs/development/libraries/webkitgtk/default.nix Outdated
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
python3
ruby
glib # for gdbus-codegen
] ++ optionals stdenv.isLinux [
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please use qualified stdenv.lib.optionals? We really should get rid of the with statement.

Otherwise looks good to me if it builds on 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.

Used stdenv.lib.optionals here, but left other optionals etc. unchanged.

@ofborg ofborg bot requested a review from jtojnar December 7, 2020 05:01
@jtojnar
Copy link
Contributor

jtojnar commented Dec 7, 2020

Great, thanks.

@jtojnar jtojnar merged commit 22f8e94 into NixOS:master Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hedning hedning Awaiting requested review from hedning

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@jtojnar jtojnar Awaiting requested review from jtojnar

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@holymonson @jtojnar