xsecurelock: add extra derivation parameter and NixOS module #47263
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrew-d
force-pushed
the
andrew/xsecurelock-nixos
branch
from
7f2c6db
to
27eec93
Compare
|
@GrahamcOfBorg build xsecurelock |
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: xsecurelock Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xsecurelock Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: xsecurelock Partial log (click to expand)
|
matthewbauer
reviewed
Oct 5, 2018
| # Allow adding extra modules to the helper directory | ||
| postInstall = | ||
| let | ||
| copyHelper = path: "cp -v ${path} $out/libexec/xsecurelock/"; |
There was a problem hiding this comment.
The problem with doing this is we have to rebuild with every new module. Instead, I would recommend patching xsecurelock so that HELPER_PATH is /run/curren-system/sw that way modules can just go into systemPackages.
There was a problem hiding this comment.
Does that break when you don't have the package installed system-wide, though? Since it's a compile-time option, I think that means that if you're installing this using nix-env -i, xsecurelock won't be able to find any helpers since they'll be in /nix/var/nix/profiles/?
|
Can we get it to look at |
|
So, after some digging, it turns out that xsecurelock_saver_image = pkgs.writeScriptBin "saver_image" ''
#!${pkgs.stdenv.shell}
# Blank the screen if we don't have an image file.
if [ -z "$XSECURELOCK_IMAGE_FILE" ]; then
exec ${pkgs.xsecurelock}/libexec/xsecurelock/saver_blank
fi
# Otherwise, draw onto the given window.
${pkgs.xloadimage}/bin/xloadimage \
-fullscreen \
-windowid $XSCREENSAVER_WINDOW \
$XSECURELOCK_IMAGE_FILE
# This will get killed by xsecurelock, so just wait forever.
exec sleep 86400
''; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I'd like to use
xsecurelockin NixOS, but adding a new screensaver or auth module requires that you build the changes into the derivation. I've added a NixOS module that allows easier configuration of such modules.I would appreciate any input; I think this is the first NixOS module I've ever written from scratch.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)cc? @fpletz (maintainer of
xsecurelock)