about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-12-18T19·08+0300
committertazjin <mail@tazj.in>2021-12-18T20·26+0000
commit54140b34c5ce5e6bac5c8193d891b622df51b6ca (patch)
tree4c35ef7036c32c3bf6e0af597b72aa1bf8f0e7a5
parentd01848437635184b685088db7e86d7df7eb1584a (diff)
fix(3p/overlays): Attempt to fix hard-to-debug suspend issue r/3296
I have an issue where my AMD laptop occasionally does not wake from
suspend. The only thing ever indicated in the logs is related to the
patched line here:

  xss-lock[2409537]: saver_blank: line 19: exec: sleep: not found

This stems from xsecurelock calling a script that in turn calls sleep,
in a loop.

I don't know if this causes my unsuspend problem because this also
happens sometimes without anything failing, but it's the best lead
I've got for now. Will run with this fix for a while and see if
anything changes in the stability of suspend.

Change-Id: Ie8190433c2125cbeddb909013be9dfa00141d5c6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4403
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
-rw-r--r--third_party/overlays/tvl.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index df21e8819b..c6b6e86dc8 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -76,4 +76,14 @@ self: super: {
       outputHash = "19p15gavcjldn1di7yyn80ys6rj4ajaprqk8x34vxslr4y2qychf";
     });
   });
+
+  # TODO(tazjin): determine whether this is the cause of my suspend
+  # bugs, and if so, upstream it to nixpkgs.
+  xsecurelock = super.xsecurelock.overrideAttrs(drv: rec {
+    buildInputs = drv.buildInputs ++ [ self.makeWrapper ];
+    postInstall = ''
+      wrapProgram $out/libexec/xsecurelock/saver_blank \
+        --prefix PATH : ${self.coreutils}/bin
+    '';
+  });
 }