diff --git a/default.nix b/default.nix index f00c36c..785cdea 100644 --- a/default.nix +++ b/default.nix @@ -17,13 +17,12 @@ let clack jzon serapeum - deploy openssl openssl.out openssl.dev ]); in -stdenv.mkDerivation rec { +sbcl.buildASDFSystem { name = "tfcconnection"; pname = "tfcconnection"; version = "0.0.1"; @@ -38,6 +37,23 @@ stdenv.mkDerivation rec { hugo go sbcl' + openssl + openssl.out + openssl.dev + ]; + + nativeLibs = [ + openssl + openssl.out + openssl.dev + ]; + + lispLibs = with sbclPackages; [ + hunchentoot + dexador + clack + jzon + serapeum ]; buildPhase = '' @@ -48,8 +64,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp tfcapi $out/bin - # wrapProgram $out/bin/tfcapi \ - # --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH \ + wrapProgram $out/bin/tfcapi \ + --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH \ ''; meta = with lib; { diff --git a/src/compile.lisp b/src/compile.lisp deleted file mode 100644 index 0eec152..0000000 --- a/src/compile.lisp +++ /dev/null @@ -1,9 +0,0 @@ -(load "~/quicklisp/setup.lisp") -(ql:quickload :parenscript) - -(defpackage tfcconnection - (:use #:ps)) - -(in-package :tfcconnection) - -(with-open-file (ps:*parenscript-stream* #P"~/dev/tfcconnection/static/js/health-form.js" :direction :output :if-exists :supersede) (ps:ps-compile-file #P"~/dev/tfcconnection/src/health-form.lisp")) diff --git a/tfcserver.asd b/tfcserver.asd index 500c1ab..b4d1a21 100644 --- a/tfcserver.asd +++ b/tfcserver.asd @@ -1,5 +1,5 @@ #-asdf3.1 (error "requires asdf 3.1") -#+linux (deploy:define-library deploy::compression-lib :dont-deploy T) +;; #+linux (deploy:define-library deploy::compression-lib :dont-deploy T) (defsystem "tfcserver" :version "0.1.0" @@ -12,7 +12,7 @@ :description "Restful server to handle website pieces" :long-description "Restful server to handle website pieces" ;; :in-order-to ((test-op (test-op "tfcserver-test"))) - :defsystem-depends-on (:deploy) ;; (ql:quickload "deploy") before - :build-operation "deploy-op" ;; leave as is + ;; :defsystem-depends-on (:deploy) ;; (ql:quickload "deploy") before + :build-operation "program-op" ;; leave as is :build-pathname "tfcapi" :entry-point "tfc-server::main")