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,9 +4,10 @@ with lib;
let let
cfg = config.fudo.slynk; cfg = config.fudo.slynk;
initScript = port: load-paths: let initScript = port: load-paths:
let
load-path-string = load-path-string =
concatStringsSep " " (map (path: "\"${path}\"") load-paths); concatStringsSep " " (map (path: ''"${path}"'') load-paths);
in pkgs.writeText "slynk.lisp" '' in pkgs.writeText "slynk.lisp" ''
(load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))) (load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname)))
(ql:quickload :slynk) (ql:quickload :slynk)
@ -47,11 +48,12 @@ 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 =
"${pkgs.sbcl}/bin/sbcl --load ${initScript cfg.port load-paths}";
Restart = "on-failure"; Restart = "on-failure";
PIDFile = "/run/slynk.$USERNAME.pid"; PIDFile = "/run/slynk.$USERNAME.pid";
}; };
@ -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";
};
}; };
}; };
} }