From 6a6276c2e08bfc387e4b825b020fccfefc0f37f2 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 21 Jul 2023 04:46:18 +0000
Subject: [PATCH] koreader-from-src: get deps compiling: lua-htmlparser, lpeg

---
 pkgs/additional/koreader-from-src/default.nix | 5 ++++-
 pkgs/additional/koreader-from-src/sources.nix | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/additional/koreader-from-src/default.nix b/pkgs/additional/koreader-from-src/default.nix
index fb80caf7..d561a650 100644
--- a/pkgs/additional/koreader-from-src/default.nix
+++ b/pkgs/additional/koreader-from-src/default.nix
@@ -14,6 +14,7 @@
 , gnutar
 , gtk3-x11
 , luajit
+# , lua51Packages
 , perl
 , pkg-config
 , ragel
@@ -23,6 +24,7 @@
 , which
 }:
 let
+  # XXX: koreader assumes lua 5.1 in places -- is this really ok?
   luajit_lua52 = luajit.override { enable52Compat = true; };
   sources = import ./sources.nix;
 in
@@ -76,12 +78,13 @@ stdenv.mkDerivation rec {
     dpkg
     git
     libtool
+    # lua51Packages.luarocks
     makeWrapper
     perl  # TODO: openssl might try to take a runtime dep on this; see nixpkg
     pkg-config
     ragel
     which
-    # luajit_lua52.pkgs.luarocks
+    luajit_lua52.pkgs.luarocks
   ];
   buildInputs = [
     glib
diff --git a/pkgs/additional/koreader-from-src/sources.nix b/pkgs/additional/koreader-from-src/sources.nix
index 8b66f248..dcc935e7 100644
--- a/pkgs/additional/koreader-from-src/sources.nix
+++ b/pkgs/additional/koreader-from-src/sources.nix
@@ -108,8 +108,7 @@
       source.hash = "sha256-AAw6I+MxDaxmGpjC5efxuBNw7Lx8FXwg2TEfl6LfPfQ=";
     };
     lua-htmlparser = {
-      # TODO: fails build
-      # - `sh: line 1: luarocks: command not found`
+      # Completed
       source.url = "https://github.com/msva/lua-htmlparser";
       source.rev = "5ce9a775a345cf458c0388d7288e246bb1b82bff";
       source.hash = "sha256-aSTLSfqz/MIDFVRwtBlDNBUhPb7KqOl32/Y62Hdec1s=";
@@ -121,6 +120,7 @@
       source.hash = "sha256-pfMNQFulW6AEwAVPxn9wUdbRg3ViHbGVCCke5NSIgTo=";
     };
     lua-rapidjson = {
+      # Completed
       source.url = "https://github.com/xpol/lua-rapidjson";
       source.rev = "242b40c8eaceb0cc43bcab88309736461cac1234";
       source.hash = "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=";
@@ -138,6 +138,9 @@
       source.hash = "sha256-Y35QYNLznQmErr6rIjxLzw0/6Y7y8TbzD4yaEdgEljA=";
     };
     lua-Spore = {
+      # TODO: fails with:
+      # Missing dependencies for lua-spore 0.3.1-1:
+      # luajson >= 1.3 (not installed)
       source.url = "https://framagit.org/fperrad/lua-Spore";
       source.rev = "tags/0.3.3";
       source.hash = "sha256-wb7ykJsndoq0DazHpfXieUcBBptowYqD/eTTN/EK/6g=";
@@ -236,6 +239,7 @@
       hash = "sha256-zPU2YgpFRY0muoOIepg7loJwAekqE4R7ReSSXMiRMXg=";
     };
     lpeg = {
+      # Completed
       url = "http://distcache.FreeBSD.org/ports-distfiles/lpeg-1.0.2.tar.gz";
       hash = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
     };