pkgs/maps/default.nix

@@ -34,14 +34,11 @@ let
       hash = "sha256-VYr/DV1FAyzPe6p6Quc1nmsHup23IAMfz532rL167Q4=";
     };
   };
-  rxi-json = callPackage ../rxi-json { lua = lua5_3; };
   lua = lua5_3.withPackages (ps: with ps; [
     lgi
     luafilesystem
     luaposix
     readline
-    http
-    rxi-json
   ]);
   pname = "maps";
 in stdenv.mkDerivation {
@@ -52,12 +49,15 @@ in stdenv.mkDerivation {
   buildInputs = [
     lua
     gtk3.dev
-    gobject-introspection 
+    gobject-introspection # .dev
     osm-gps-map
     glib-networking
+#    gdk-pixbuf
+    #    glib
+#    libchamplain
   ];
   nativeBuildInputs = [
-#    lua
+    buildPackages.lua
     gobject-introspection
     makeWrapper
     fennel
@@ -65,7 +65,6 @@ in stdenv.mkDerivation {
     copyDesktopItems
   ];
   GIO_EXTRA_MODULES = [ "${glib-networking.out}/lib/gio/modules" ];
-  RXI_JSON="${rxi-json}/";
 
   makeFlags = [ "PREFIX=${placeholder "out"}" "NAME=${pname}" ];
 

pkgs/maps/shell.nix

@@ -4,6 +4,6 @@ in
 package.overrideAttrs(o: {
   shellHook = ''
     export LUA_CPATH=$(lua -e "print(package.cpath)")
-    export LUA_PATH=$(lua -e "print(package.path)")\;$RXI_JSON/share/lua/5.3/?.lua
+    export LUA_PATH=$(lua -e "print(package.path)")
   '';
 })

pkgs/maps/tiles.fnl

@@ -1,10 +1,7 @@
 (local req (require :http.request))
 (local { : dict_to_query } (require :http.util))
-(local json (require :json))
-
 (local { : view } (require :fennel))
 
-
 (local
  query
  (->
@@ -20,7 +17,7 @@
    "-96.339893442898"
    ");"
    ");"
-   "out ;"
+   "out geom;"
    ]
   (table.concat "\n")))
 
@@ -31,5 +28,5 @@
   (r:set_body (dict_to_query { :data query }))
   (let [(headers stream) (r:go)]
     (print (view headers))
-    (print (view (json.decode (stream:get_body_as_string))))))
+    (print (stream:get_body_as_string))))