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

[20.09] Fix webkitgtk and reintroduce epiphany #107981

Merged
merged 4 commits into from Jan 9, 2021
Merged

[20.09] Fix webkitgtk and reintroduce epiphany #107981

merged 4 commits into from Jan 9, 2021

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Dec 30, 2020 •
edited

Motivation for this change

Backport of #107486 and #108107.

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.

@talyz talyz requested review from worldofpeace and a team December 30, 2020 18:06
@talyz
webkitgtk: Add /run/opengl-driver to bubblewrap bind mounts
54e7d41 
Without access to the `/run/opengl-driver` directory, webkit fails to
create an EGL context, since it can't identify a suitable EGL
vendor. This results in a blank window and the following error output:

Cannot get default EGL display: EGL_BAD_PARAMETER
Cannot create EGL context: invalid display (last error: EGL_SUCCESS)

(cherry picked from commit 4c68c38)
@talyz talyz changed the title [20.09] webkitgtk: Add /run/opengl-driver to bubblewrap bind mounts [20.09] Fix webkitgtk and reintroduce epiphany Jan 1, 2021
This was referenced Jan 1, 2021
Merged
Merged
@talyz talyz added the 8.has: port to stable A PR already has a backport to the stable release. label Jan 4, 2021
@worldofpeace
Copy link
Contributor

I requested changes at #108107. As such this will have to be done different than that PR itself.

@talyz
Revert "nixos/gnome3: don't install epiphany default"
5e03239 
This reverts commit 13b1927, since
NixOS#98819 is now fixed.

(cherry picked from commit 39cce2f)
@talyz
Revert "nixos/gnome3: don't put epiphany in favorite apps"
c64d20f 
This reverts commit 70dc25a.

(cherry picked from commit 6a12654)
@talyz
nixos/gnome3: Note the reintroduction of epiphany in release notes
ebd810c 
(cherry picked from commit 8ed9987)
@talyz
Copy link
Contributor Author

talyz commented Jan 5, 2021

@worldofpeace I've updated this PR with the requested changes from #108107.

@worldofpeace worldofpeace merged commit 14acb54 into NixOS:release-20.09 Jan 9, 2021
@talyz talyz deleted the release-20.09 branch January 11, 2021 21:36
@talyz talyz restored the release-20.09 branch January 11, 2021 21:36
@talyz talyz deleted the release-20.09 branch January 11, 2021 21:37
@talyz talyz restored the release-20.09 branch January 11, 2021 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 8.has: changelog 8.has: documentation 8.has: module (update) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@talyz @worldofpeace