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

webkitgtk24x: fix build with gcc6 #28633

Merged
merged 1 commit into from
Aug 28, 2017
Merged

webkitgtk24x: fix build with gcc6 #28633

merged 1 commit into from
Aug 28, 2017

Conversation

orivej
Copy link
Contributor

@orivej orivej commented Aug 28, 2017

Motivation for this change

webkitgtk24x-gtk2 and webkitgtk24x-gtk3 fail to build with gcc6.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Tested building webkitgtk24x-gtk2 and webkitgtk24x-gtk3.

Mic92
Mic92 reviewed Aug 28, 2017
View reviewed changes
pkgs/development/libraries/webkitgtk/2.4.nix Outdated
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
'';
patches = [
./webcore-svg-libxml-cflags.patch
(fetchurl {
Copy link
Member

Choose a reason for hiding this comment

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

please also use fetchpatch here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. I hope @globin or you will explain when to use fetchpatch: #28634 (comment)

Copy link
Member

@Mic92 Mic92 Aug 28, 2017 •
edited

Choose a reason for hiding this comment

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

Always for patches. In some case like yours fetchurl might be fine. But that way it is more consistent.

@Mic92 Mic92 merged commit cfbdd3e into NixOS:master Aug 28, 2017
@orivej orivej deleted the webkitgtk24x branch August 28, 2017 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@orivej @Mic92