biscuit

commit 157344842ca7bd5dfaeb1e88af7b1a1f55fe734a
parent e26a53ada8903fff5c5eec9256e0478d2fe9c00a
Author: Daniel Barlow <dan@telent.net>
Date:   Sat, 28 Feb 2026 01:27:41 +0000

install Maps in a eway that lets it find its source code

Diffstat:
M
pkgs/maps/Makefile
 | 
13
+++++++++----
M
pkgs/maps/default.nix
 | 
7
++-----

2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/pkgs/maps/Makefile b/pkgs/maps/Makefile
@@ -2,13 +2,17 @@ FENNEL?=fennel
 PREFIX?=/usr/local
 NAME?=maps
 
-MODULES=main.fnl tiles.fnl
+MODULES=main.fnl tiles.fnl nmea.fnl
+MODULES_LUA=$(patsubst %.fnl,%.lua,$(MODULES))
+
 
 %.lua : %.fnl
 	$(FENNEL) --compile $< > $@
 
-$(NAME): $(patsubst %.fnl,%.lua,$(MODULES)) Makefile
-	(echo -e "#!/usr/bin/env lua\n" ; cat main.lua ) > $@
+$(NAME): $(MODULES_LUA) Makefile
+	echo -e "#!/usr/bin/env lua\n" \
+	"package.path=\"$(PREFIX)/share/lua/5.3/?.lua;$(shell lua -e 'print(package.path)')\"; " \
+	'require("main").run()' > $@
 	chmod +x $@
 
 run:
@@ -18,5 +22,6 @@ test:
 	fennel run-tests.fnl $(MODULES)
 
 install:
-	mkdir -p $(PREFIX)/bin $(PREFIX)/
+	mkdir -p $(PREFIX)/bin $(PREFIX)/share/lua/5.3/
 	cp $(NAME) $(PREFIX)/bin
+	cp $(MODULES_LUA) $(PREFIX)/share/lua/5.3/
diff --git a/pkgs/maps/default.nix b/pkgs/maps/default.nix
@@ -12,10 +12,8 @@
 , lua53Packages
 , lua5_3
 , makeDesktopItem
-, makeWrapper
 , wrapGAppsHook3
 , writeText
-, osm-gps-map
 , glib-networking
 , copyDesktopItems
 }:
@@ -36,6 +34,7 @@ let
     };
   };
   rxi-json = callPackage ../rxi-json { lua = lua5_3; };
+
   lua = lua5_3.withPackages (ps: with ps; [
     lgi
     luafilesystem
@@ -58,15 +57,13 @@ in stdenv.mkDerivation {
     glib-networking
   ];
   nativeBuildInputs = [
-#    lua
     gobject-introspection
-    makeWrapper
     fennel
     wrapGAppsHook3
     copyDesktopItems
   ];
+
   GIO_EXTRA_MODULES = [ "${glib-networking.out}/lib/gio/modules" ];
-  RXI_JSON="${rxi-json}/";
   CAIRO_TRACE_SO = "${cairo.out}/lib/cairo/libcairo-trace.so";
 
   makeFlags = [ "PREFIX=${placeholder "out"}" "NAME=${pname}" ];