omen: add openssh to nix-daemon

Signed-off-by: magic_rb <magic_rb@redalder.org>
This commit is contained in:
magic_rb 2024-10-06 21:05:27 +02:00
parent 434dd4eec1
commit 0b32e14aac
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 18 additions and 0 deletions

View file

@ -84,6 +84,9 @@ in {
];
documentation.dev.enable = true;
systemd.services.nix-daemon.path = [
pkgs.openssh
];
systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/user/${toString config.users.users.main.uid}/gnupg/S.gpg-agent.ssh";
systemd.services.nix-daemon.environment.NIX_SSHOPTS = "-o ControlMaster=auto -o ControlPath=/tmp/nix-daemon-controlmasters/%%r@%%h:%%p -o ControlPersist=300s";

View file

@ -0,0 +1,15 @@
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 342212f5185..48311d86f40 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -102,7 +102,9 @@ and above."
(defcustom native-comp-driver-options
(cond ((eq system-type 'darwin) '("-Wl,-w"))
- ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
+ ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))
+ (t '(@backendPath@)))
+
"Options passed verbatim to the native compiler's back-end driver.
Note that not all options are meaningful; typically only the options
affecting the assembler and linker are likely to be useful.