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.

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

[20.09] firefox-wayland: fix screen sharing using pipewire #107699

Merged
merged 1 commit into from Jan 12, 2021

Conversation

Stunkymonkey
Copy link
Contributor

cherry-pick from #106815

Motivation for this change

since it got fixed on master-branch @fadenb reports, that this also works for the nixos-20.09-branch

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.

After the fedora patches for screen sharing using pipewire got updated
for Firefox 83 (pipewire was inlined there), the nixpkgs buildInput
pipewire got stripped from the resulting firefox binary and so firefox
was unable to actually get the shared stream from the running pipewire
service.

Adding pipewire to the firefox binary with `patchelf --add-needed`
makes it atually get the stream from the service.

Fixes: NixOS#106812
@ofborg ofborg bot requested review from andir and edolstra December 27, 2020 09:57
@SuperSandro2000 SuperSandro2000 changed the title firefox-wayland: fix screen sharing using pipewire [20.09] firefox-wayland: fix screen sharing using pipewire Dec 27, 2020
@zimbatm
Copy link
Member

zimbatm commented Jan 12, 2021

Result of nixpkgs-review pr 107699 run on x86_64-linux 1

4 packages built:
  • adoptopenjdk-icedtea-web
  • firefox-esr-78-unwrapped (firefoxPackages.firefox-esr-78)
  • xulrunner (firefox-unwrapped)
  • slimerjs

@zimbatm zimbatm merged commit aa5b9cd into NixOS:nixos-20.09 Jan 12, 2021
@erictapen
Copy link
Member

erictapen commented Jan 14, 2021

This got merged into nixos-20.09. Please never merge anything into nixos-20.09 but use either release-20.09 or staging-20.09 for that.

Now we have cache misses for firefox on the stable release.

Any idea on how to proceed from that? Do we need to force push to nixos-20.09?

erictapen pushed a commit that referenced this pull request Jan 14, 2021
After the fedora patches for screen sharing using pipewire got updated
for Firefox 83 (pipewire was inlined there), the nixpkgs buildInput
pipewire got stripped from the resulting firefox binary and so firefox
was unable to actually get the shared stream from the running pipewire
service.

Adding pipewire to the firefox binary with `patchelf --add-needed`
makes it atually get the stream from the service.

Fixes: #106812
(cherry picked from commit 62f20b0)

Picked this from #107699,
as the original commit was overwritten by a force-push.
@erictapen
Copy link
Member

As this was just overwritten by a force-push, I cherry-picked this on release-20.09: e8bb989

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/nixos-20-09-channel-updated-without-firefox/10982/2

@Stunkymonkey
Copy link
Contributor Author

sorry did not know that. Thanks for fixing 👍

@Stunkymonkey Stunkymonkey deleted the firefox-pipewire-fix branch July 24, 2021 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants