From e2ce36d2f85552b9a514dd2c3a2ead1bd63add0a Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 25 Jun 2023 23:23:16 -0700 Subject: [PATCH] Remove ref to openssl_1_1 --- lib/fudo/slynk.nix | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/fudo/slynk.nix b/lib/fudo/slynk.nix index 8ae12ed..8547251 100644 --- a/lib/fudo/slynk.nix +++ b/lib/fudo/slynk.nix @@ -4,21 +4,22 @@ with lib; let cfg = config.fudo.slynk; - initScript = port: load-paths: let - load-path-string = - concatStringsSep " " (map (path: "\"${path}\"") load-paths); - in pkgs.writeText "slynk.lisp" '' - (load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))) - (ql:quickload :slynk) - (setf asdf:*central-registry* - (append asdf:*central-registry* - (list ${load-path-string}))) - (slynk:create-server :port ${toString port} :dont-close t) - (dolist (var '("LD_LIBRARY_PATH")) - (format t "~S: ~S~%" var (sb-unix::posix-getenv var))) + initScript = port: load-paths: + let + load-path-string = + concatStringsSep " " (map (path: ''"${path}"'') load-paths); + in pkgs.writeText "slynk.lisp" '' + (load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))) + (ql:quickload :slynk) + (setf asdf:*central-registry* + (append asdf:*central-registry* + (list ${load-path-string}))) + (slynk:create-server :port ${toString port} :dont-close t) + (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; [ alexandria @@ -47,14 +48,15 @@ in { systemd.user.services.slynk = { description = "Slynk Common Lisp server."; - serviceConfig = let - load-paths = (map (pkg: "${pkg}/lib/common-lisp/") lisp-libs); - in { - ExecStartPre = "${pkgs.lispPackages.quicklisp}/bin/quicklisp init"; - ExecStart = "${pkgs.sbcl}/bin/sbcl --load ${initScript cfg.port load-paths}"; - Restart = "on-failure"; - PIDFile = "/run/slynk.$USERNAME.pid"; - }; + serviceConfig = + let load-paths = (map (pkg: "${pkg}/lib/common-lisp/") lisp-libs); + in { + ExecStartPre = "${pkgs.lispPackages.quicklisp}/bin/quicklisp init"; + ExecStart = + "${pkgs.sbcl}/bin/sbcl --load ${initScript cfg.port load-paths}"; + Restart = "on-failure"; + PIDFile = "/run/slynk.$USERNAME.pid"; + }; path = with pkgs; [ gcc @@ -62,9 +64,7 @@ in { file ]; - environment = { - LD_LIBRARY_PATH = "${pkgs.openssl_1_1.out}/lib"; - }; + environment = { LD_LIBRARY_PATH = "${pkgs.openssl.out}/lib"; }; }; }; }