hack in rxi-json
This commit is contained in:
parent
a2906f5150
commit
26ebbe21b5
@ -34,11 +34,14 @@ let
|
|||||||
hash = "sha256-VYr/DV1FAyzPe6p6Quc1nmsHup23IAMfz532rL167Q4=";
|
hash = "sha256-VYr/DV1FAyzPe6p6Quc1nmsHup23IAMfz532rL167Q4=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
rxi-json = callPackage ../rxi-json { lua = lua5_3; };
|
||||||
lua = lua5_3.withPackages (ps: with ps; [
|
lua = lua5_3.withPackages (ps: with ps; [
|
||||||
lgi
|
lgi
|
||||||
luafilesystem
|
luafilesystem
|
||||||
luaposix
|
luaposix
|
||||||
readline
|
readline
|
||||||
|
http
|
||||||
|
rxi-json
|
||||||
]);
|
]);
|
||||||
pname = "maps";
|
pname = "maps";
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
@ -49,15 +52,12 @@ in stdenv.mkDerivation {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
lua
|
lua
|
||||||
gtk3.dev
|
gtk3.dev
|
||||||
gobject-introspection # .dev
|
gobject-introspection
|
||||||
osm-gps-map
|
osm-gps-map
|
||||||
glib-networking
|
glib-networking
|
||||||
# gdk-pixbuf
|
|
||||||
# glib
|
|
||||||
# libchamplain
|
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
buildPackages.lua
|
# lua
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
makeWrapper
|
makeWrapper
|
||||||
fennel
|
fennel
|
||||||
@ -65,6 +65,7 @@ in stdenv.mkDerivation {
|
|||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
];
|
];
|
||||||
GIO_EXTRA_MODULES = [ "${glib-networking.out}/lib/gio/modules" ];
|
GIO_EXTRA_MODULES = [ "${glib-networking.out}/lib/gio/modules" ];
|
||||||
|
RXI_JSON="${rxi-json}/";
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=${placeholder "out"}" "NAME=${pname}" ];
|
makeFlags = [ "PREFIX=${placeholder "out"}" "NAME=${pname}" ];
|
||||||
|
|
||||||
|
@ -4,6 +4,6 @@ in
|
|||||||
package.overrideAttrs(o: {
|
package.overrideAttrs(o: {
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export LUA_CPATH=$(lua -e "print(package.cpath)")
|
export LUA_CPATH=$(lua -e "print(package.cpath)")
|
||||||
export LUA_PATH=$(lua -e "print(package.path)")
|
export LUA_PATH=$(lua -e "print(package.path)")\;$RXI_JSON/share/lua/5.3/?.lua
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
(local req (require :http.request))
|
(local req (require :http.request))
|
||||||
(local { : dict_to_query } (require :http.util))
|
(local { : dict_to_query } (require :http.util))
|
||||||
|
(local json (require :json))
|
||||||
|
|
||||||
(local { : view } (require :fennel))
|
(local { : view } (require :fennel))
|
||||||
|
|
||||||
|
|
||||||
(local
|
(local
|
||||||
query
|
query
|
||||||
(->
|
(->
|
||||||
|
Loading…
Reference in New Issue
Block a user