Remove ref to openssl_1_1

This commit is contained in:
niten 2023-06-25 23:23:16 -07:00
parent 2720ce9be9
commit e2ce36d2f8

View File

@ -4,21 +4,22 @@ with lib;
let let
cfg = config.fudo.slynk; cfg = config.fudo.slynk;
initScript = port: load-paths: let initScript = port: load-paths:
load-path-string = let
concatStringsSep " " (map (path: "\"${path}\"") load-paths); load-path-string =
in pkgs.writeText "slynk.lisp" '' concatStringsSep " " (map (path: ''"${path}"'') load-paths);
(load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))) in pkgs.writeText "slynk.lisp" ''
(ql:quickload :slynk) (load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname)))
(setf asdf:*central-registry* (ql:quickload :slynk)
(append asdf:*central-registry* (setf asdf:*central-registry*
(list ${load-path-string}))) (append asdf:*central-registry*
(slynk:create-server :port ${toString port} :dont-close t) (list ${load-path-string})))
(dolist (var '("LD_LIBRARY_PATH")) (slynk:create-server :port ${toString port} :dont-close t)
(format t "~S: ~S~%" var (sb-unix::posix-getenv var))) (dolist (var '("LD_LIBRARY_PATH"))
(format t "~S: ~S~%" var (sb-unix::posix-getenv var)))
(loop (sleep 60)) (loop (sleep 60))
''; '';
lisp-libs = with pkgs.lispPackages; [ lisp-libs = with pkgs.lispPackages; [
alexandria alexandria
@ -47,14 +48,15 @@ in {
systemd.user.services.slynk = { systemd.user.services.slynk = {
description = "Slynk Common Lisp server."; description = "Slynk Common Lisp server.";
serviceConfig = let serviceConfig =
load-paths = (map (pkg: "${pkg}/lib/common-lisp/") lisp-libs); let load-paths = (map (pkg: "${pkg}/lib/common-lisp/") lisp-libs);
in { in {
ExecStartPre = "${pkgs.lispPackages.quicklisp}/bin/quicklisp init"; ExecStartPre = "${pkgs.lispPackages.quicklisp}/bin/quicklisp init";
ExecStart = "${pkgs.sbcl}/bin/sbcl --load ${initScript cfg.port load-paths}"; ExecStart =
Restart = "on-failure"; "${pkgs.sbcl}/bin/sbcl --load ${initScript cfg.port load-paths}";
PIDFile = "/run/slynk.$USERNAME.pid"; Restart = "on-failure";
}; PIDFile = "/run/slynk.$USERNAME.pid";
};
path = with pkgs; [ path = with pkgs; [
gcc gcc
@ -62,9 +64,7 @@ in {
file file
]; ];
environment = { environment = { LD_LIBRARY_PATH = "${pkgs.openssl.out}/lib"; };
LD_LIBRARY_PATH = "${pkgs.openssl_1_1.out}/lib";
};
}; };
}; };
} }