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

xsecurelock: Added missing X11 buildInputs #56630

Merged
merged 1 commit into from Mar 2, 2019
Merged

xsecurelock: Added missing X11 buildInputs #56630

merged 1 commit into from Mar 2, 2019

Conversation

thiagokokada
Copy link
Contributor

@thiagokokada thiagokokada commented Mar 2, 2019

Motivation for this change

According to xsecurelock's configure.ac file, each of the add dependencies are used to:

  • libXrandr: XRandR provides information about monitor layouts and is strongly recommended on systems which can use more than one monitor (which includes most laptops).
  • libXext: The X Synchronization extension is used to get per-device idle times. Used by until_nonidle only.
  • libXScrnSaver: The X11 Screen Saver extension is used to turn off the screen saver when X11 handles screen blanking (e.g. via timeout) anyway. Saves CPU power.

Adding libXrandr fixes an issue where locking a screen in a multi monitor setup results in the prompt information to not be in the middle of the screen. The other dependencies are not tested if they fixed something, however since upstream recommends then I think it is fair to include them also.

nix path-info
$ nix path-info -S /nix/store/0il0hlym3yax67xc0rm7ma0v3z5pirq8-xsecurelock-1.2/bin/xsecurelock # Before
/nix/store/0il0hlym3yax67xc0rm7ma0v3z5pirq8-xsecurelock-1.2       435328896
$ nix path-info -S /nix/store/l7i95dh3cplfzn0g0gay3590xip7b376-xsecurelock-1.2/bin/xsecurelock # After
/nix/store/l7i95dh3cplfzn0g0gay3590xip7b376-xsecurelock-1.2       466815872
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

According to xsecurelock's configure.ac file, each of the add
dependencies are used to:

- libXrandr: XRandR provides information about monitor layouts and is
strongly recommended on systems which can use more than one monitor
(which includes most laptops).
- libXext: The X Synchronization extension is used to get per-device idle
times. Used by until_nonidle only.
- libXScrnSaver: The X11 Screen Saver extension is used to turn off the
screen saver when X11 handles screen blanking (e.g. via timeout) anyway.
Saves CPU power.

Adding libXrandr fixes an issue where locking a screen in a multi
monitor setup results in the prompt information to not be in the middle
of the screen. The other dependencies are not tested if they fixed
something, however since upstream recommends than I think it is fair to
include them also.
thiagokokada added a commit to thiagokokada/dotfiles that referenced this pull request Mar 2, 2019
@fpletz
Copy link
Member

fpletz commented Mar 2, 2019

@GrahamcOfBorg build xsecurelock

@fpletz fpletz merged commit 3804497 into NixOS:master Mar 2, 2019
@thiagokokada thiagokokada deleted the add-missing-x11-deps-to-xsecurelock branch March 2, 2019 03:01
@fpletz
Copy link
Member

fpletz commented Mar 2, 2019

Thanks for noticing and fixing this! I'm using xss-lock to activate xsecurelock so I didn't run into that.

@thiagokokada
Copy link
Contributor Author

@fpletz Thanks for the fast merge!

Can this change be included in 19.03? Or is it too late?

@fpletz
Copy link
Member

fpletz commented Mar 2, 2019

Thanks for the reminder. I had already cherry-picked it to 19.03 but didn't push it yet because I had some other cherry-picks I was testing. Pushed as 8850144.

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

4 participants