colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

koreader: use nixpkgs' luasocket and luasec

Browse Source
This commit is contained in:
Colin 2024-02-04 21:05:36 +00:00
parent 8a47eb92ed
commit 7ac1ee66ad
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/additional/koreader-from-src/default.nix
View File

@ -117,6 +117,8 @@ let
propagatedBuildInputs = [ lpeg ];
})
lpeg
luasec
luasocket
rapidjson
]);
rockspecFor = luaPkgName: let
@ -240,6 +242,8 @@ let
LUAJIT="${luaEnv}/bin/luajit" \
LUAJIT_JIT="${luaEnv}/share/lua/5.1/jit" \
LUAJIT_LIB="${lib.getLib luaEnv}/lib/libluajit-5.1.so" \
LUASEC="${luaEnv}/share/lua/5.1/ssl/" \
LUASOCKET="${luaEnv}/share/lua/5.1/socket/" \
LUA_INCDIR="${lib.getDev luaEnv}/include" \
LUA_LIBDIR="${lib.getLib luaEnv}/lib/libluajit-5.1.so" \
LUA_RAPIDJSON_ROCK="${rockspecFor "rapidjson"}" \
@ -420,6 +424,8 @@ stdenv.mkDerivation rec {
--replace-warn '$(THIRDPARTY_DIR)/lpeg/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/lua-rapidjson/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/luajit/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/luasec/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/luasocket/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/openssh/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/openssl/*.*' "" \
--replace-warn '$(THIRDPARTY_DIR)/sdcv/*.*' "" \

24
pkgs/additional/koreader-from-src/sources.nix
View File

@ -198,18 +198,18 @@ in
# source.hash = "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=";
# # package: TODO: packaged in nix as a luarocks package
# };
luasec = {
source.url = "https://github.com/brunoos/luasec";
source.rev = "tags/v1.3.1";
source.hash = "sha256-3iYRNQoVk5HFjDSqRRmg1taSqeT2cHFil36vxjrEofo=";
# package: TODO: packaged in nix as a luarocks package
};
luasocket = {
source.url = "https://github.com/lunarmodules/luasocket";
source.rev = "8c2ff7217e2a205eb107a6f48b04ff1b2b3090a1";
source.hash = "sha256-Y35QYNLznQmErr6rIjxLzw0/6Y7y8TbzD4yaEdgEljA=";
# package: TODO: packaged in nix as a luarocks package
};
# luasec = {
# source.url = "https://github.com/brunoos/luasec";
# source.rev = "tags/v1.3.1";
# source.hash = "sha256-3iYRNQoVk5HFjDSqRRmg1taSqeT2cHFil36vxjrEofo=";
# # package: TODO: packaged in nix as a luarocks package
# };
# luasocket = {
# source.url = "https://github.com/lunarmodules/luasocket";
# source.rev = "8c2ff7217e2a205eb107a6f48b04ff1b2b3090a1";
# source.hash = "sha256-Y35QYNLznQmErr6rIjxLzw0/6Y7y8TbzD4yaEdgEljA=";
# # package: TODO: packaged in nix as a luarocks package
# };
lua-Spore = {
# Complete... ish?
# this originally failed like so: