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

guitarix: webkitgtk2 -> webkitgtk #23390

Merged
merged 1 commit into from Mar 3, 2017
Merged

guitarix: webkitgtk2 -> webkitgtk #23390

merged 1 commit into from Mar 3, 2017

Conversation

magnetophon
Copy link
Member

@magnetophon magnetophon commented Mar 2, 2017 •
edited

Motivation for this change

Fixes build.
Please merge in 17.03.

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

@mention-bot
Copy link

@magnetophon, thanks for your PR! By analyzing the history of the files in this pull request, we identified @codyopel, @FRidh and @astsmtl to be potential reviewers.

@magnetophon magnetophon mentioned this pull request Mar 3, 2017
Closed
50 tasks
@joachifm joachifm merged commit 0e2a8cd into NixOS:master Mar 3, 2017
@magnetophon
Copy link
Member Author

@joachifm Thanks! Could you put this in 17.03 as well?

joachifm pushed a commit that referenced this pull request Mar 3, 2017
@magnetophon @joachifm
guitarix: webkitgtk2 -> webkitgtk (#23390)
fbfb101 
(cherry picked from commit 0e2a8cd)
@joachifm
Copy link
Contributor

joachifm commented Mar 3, 2017

Picked to release at fbfb101

@vcunat
Copy link
Member

vcunat commented Mar 3, 2017

I think you can remove webkit from buildInputs in this state:

...
Checking for webkit-1.0                  : not found
...
Use Webkit                               : no
...

@magnetophon
Copy link
Member Author

@vcunat Oops! I'll look into it.

@vcunat
Copy link
Member

vcunat commented Mar 3, 2017

It sounds like they only support webkit-1.0 and that's exactly the old API that noone maintains anymore.

@magnetophon
Copy link
Member Author

@vcunat OK, building without webkit now.

@joachifm
Copy link
Contributor

joachifm commented Mar 3, 2017

Sigh ... I will revert this then.

@vcunat
Copy link
Member

vcunat commented Mar 3, 2017

Better without webkit than with a vulnerable one, I think.

@joachifm
Copy link
Contributor

joachifm commented Mar 3, 2017

What I mean is, I expect a PR to remove webkit outright to replace this one.

@magnetophon
Copy link
Member Author

@joachifm I'm also adding gperf and roboto.

joachifm added a commit that referenced this pull request Mar 3, 2017
@joachifm
Revert "guitarix: webkitgtk2 -> webkitgtk (#23390)"
86f6b49 
This reverts commit fbfb101.

See c48f6b152fbdc29c1379d681ee916485c81f53c1
joachifm added a commit that referenced this pull request Mar 3, 2017
@joachifm
Revert "guitarix: webkitgtk2 -> webkitgtk (#23390)"
fb3853c 
This reverts commit 0e2a8cd.

Per #23390 (comment)
guitarix only works with webkit1; replacing it with webkit2 then
is equivalent to removing it outright.
@magnetophon
Copy link
Member Author

hmm, I guess I'll skip the roboto, since it's not finding it anyway.

@vcunat
Copy link
Member

vcunat commented Mar 3, 2017 •
edited

gperf is normally needed by packages only when you change some of the released files (it's a source-code generator).

@magnetophon
Copy link
Member Author

@vcunat OK thanks.

@magnetophon magnetophon mentioned this pull request Mar 5, 2017
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
4 participants
@magnetophon @mention-bot @joachifm @vcunat