From 7a5017fd17e14085257a6317c1d2e4c40bf14f39 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Fri, 16 Sep 2022 23:21:07 +0100 Subject: [PATCH] fix package search path in wrapper --- default.nix | 5 ++++- main.fnl | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 3679870..07c7780 100644 --- a/default.nix +++ b/default.nix @@ -21,7 +21,10 @@ in stdenv.mkDerivation { lua_path="`lua -e 'print(package.path)'`" lua_cpath="`lua -e 'print(package.cpath)'`" - makeWrapper ${myfennel}/bin/fennel $out/bin/grafana-sms-alert \ + makeWrapper ${myfennel}/bin/fennel \ + $out/bin/grafana-sms-alert \ + --add-flags "--add-fennel-path $out/lib/?.fnl" \ + --add-flags "--add-package-path $out/lib/?.lua" \ --add-flags "$out/lib/main.fnl" ''; buildInputs = [lua myfennel]; diff --git a/main.fnl b/main.fnl index d4e6e7d..94cecff 100644 --- a/main.fnl +++ b/main.fnl @@ -1,5 +1,4 @@ -(set _G.modem-spew io.stderr) - +; (set _G.modem-spew io.stderr) (local server (require :server)) (local webhook (require :webhook)) (local json (require :dkjson)) @@ -13,8 +12,6 @@ (nil pos err) (error (.. "reading " filename ": " err))))) (local { : view} (require :fennel)) -;(print (view m) (view err)) - (local sms ((. (require :sms) :new) { :smsc smsc :device device }))