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

firefox: fix libXScrnSaver dynamic dependency #95896

Merged
merged 1 commit into from Aug 25, 2020
Merged

firefox: fix libXScrnSaver dynamic dependency #95896

merged 1 commit into from Aug 25, 2020

Conversation

Enzime
Copy link
Member

@Enzime Enzime commented Aug 21, 2020 •
edited

Motivation for this change

Firefox loads libXss.so.1 dynamically and was not able to load it previously, leading to the screen turning off while watching videos.

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.

@ofborg ofborg bot requested review from edolstra and andir August 21, 2020 17:31
@Enzime
Copy link
Member Author

Enzime commented Aug 22, 2020 •
edited

Tested both firefox and firefox-unwrapped by checking that they loaded libXss after playing a video with:

MOZ_LOG=LinuxWakeLog:5 ./result/bin/firefox
lsof -p <pid> | grep libXss

Using the MOZ_LOG tells Firefox to log when it tries to disable DPMS (should be when you play a video) which also includes the main thread PID.

@Enzime
Copy link
Member Author

Enzime commented Aug 22, 2020

@ofborg build firefox

@Enzime Enzime requested a review from vcunat August 22, 2020 12:22
vcunat
vcunat approved these changes Aug 23, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

I haven't tested that it really disables the screensavers, but all the versions build and the RPATH seems set up the right way (also in the result).

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/207

@AndersonTorres AndersonTorres merged commit a607e0e into NixOS:master Aug 25, 2020
infinisil added a commit to infinisil/system that referenced this pull request Oct 16, 2020
@infinisil
Update nixpkgs and NUR (fixes sleepy firefox!)
aa85dd9 
This update includes NixOS/nixpkgs#95896, which
fixes the long-standing issue of Firefox not preventing DPMS
from triggering when playing videos!
@Enzime Enzime deleted the fix-dpms-firefox branch April 13, 2021 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@edolstra edolstra Awaiting requested review from edolstra

@andir andir Awaiting requested review from andir

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Enzime @nixos-discourse @vcunat @AndersonTorres