diff --git a/pkgs/additional/koreader-from-src/default.nix b/pkgs/additional/koreader-from-src/default.nix index 63c7c175..0a6d6505 100644 --- a/pkgs/additional/koreader-from-src/default.nix +++ b/pkgs/additional/koreader-from-src/default.nix @@ -78,8 +78,7 @@ stdenv.mkDerivation rec { ); patches = [ - ./debug.patch - # ./mupdf_dir.patch #< TODO: needed? + ./debug.patch #< not needed to build, just helps debug packaging issues ./no_rm_build_dirs.patch ./lua-Spore-no-luajson.patch #< TODO: test this at runtime! we ship luajson, but just don't expose it via luarocks... (substituteAll ( diff --git a/pkgs/additional/koreader-from-src/mupdf_dir.patch b/pkgs/additional/koreader-from-src/mupdf_dir.patch deleted file mode 100644 index 7f93d9e5..00000000 --- a/pkgs/additional/koreader-from-src/mupdf_dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/base/Makefile.defs b/base/Makefile.defs -index dbb95daa..1293e5d5 100644 ---- a/base/Makefile.defs -+++ b/base/Makefile.defs -@@ -732,8 +732,8 @@ MINIZIP_DIR=$(CURDIR)/$(MINIZIP_BUILD_DIR)/minizip-prefix/src/minizip - AES_LIB_DIR=$(MINIZIP_DIR)/aes - AES_LIB=$(MINIZIP_DIR)/libaes.a - --MUPDF_BUILD_DIR=$(CURDIR)/$(THIRDPARTY_DIR)/mupdf/build/$(MACHINE) --MUPDF_DIR=$(MUPDF_BUILD_DIR)/mupdf-prefix/src/mupdf -+MUPDF_BUILD_DIR=$(THIRDPARTY_DIR)/mupdf/build/$(MACHINE) -+MUPDF_DIR=$(CURDIR)/$(MUPDF_BUILD_DIR)/mupdf-prefix/src/mupdf - MUPDF_LIB_DIR=$(MUPDF_DIR)/build/$(if $(KODEBUG),debug,release) - MUPDF_LIB_STATIC=$(MUPDF_LIB_DIR)/libmupdf.a - MUPDF_THIRDPARTY_LIBS=$(MUPDF_LIB_DIR)/libmupdfthird.a \ diff --git a/pkgs/additional/koreader-from-src/sources.nix b/pkgs/additional/koreader-from-src/sources.nix index a572d7e3..f6d4c904 100644 --- a/pkgs/additional/koreader-from-src/sources.nix +++ b/pkgs/additional/koreader-from-src/sources.nix @@ -6,13 +6,11 @@ source.hash = "sha256-kzozc0Io+1f4UMivSV2IhzJDQXmad4wNhXN/Y2Lsg3Q="; }; czmq = { - # Completed source.url = "https://github.com/zeromq/czmq.git"; source.rev = "2a0ddbc4b2dde623220d7f4980ddd60e910cfa78"; source.hash = "sha256-p4Cl2PLVgRQ0S4qr3VClJXjvAd2LUBU9oRUvOCfVnyw="; }; djvulibre = { - # Completed source.url = "https://gitlab.com/koreader/djvulibre.git"; source.rev = "6a1e5ba1c9ef81c205a4b270c3f121a1e106f4fc"; source.hash = "sha256-OWSbxdr93FH3ed0D+NSFWIah7VDTcL3LIGOciY+f4dk="; @@ -23,31 +21,26 @@ source.hash = "sha256-JlanCl4XQBFnrpRIEsowSeUI7wSa9RoQc5h3pkMHXA8="; }; freetype2 = { - # Completed source.url = "https://gitlab.com/koreader/freetype2.git"; source.rev = "VER-2-13-1"; source.hash = "sha256-rQN+hRzrs+KGgp8+n1VJzOOwtKUcRuSE/s/r8/xOUdI="; }; fribidi = { - # Completed source.url = "https://github.com/fribidi/fribidi.git"; source.rev = "tags/v1.0.12"; source.hash = "sha256-L4m/F9rs8fiv9rSf8oy7P6cthhupc6R/lCv30PLiQ4M="; }; giflib = { - # Completed source.url = "https://gitlab.com/koreader/giflib.git"; source.rev = "5.1.4"; source.hash = "sha256-znbY4tliXHXVLBd8sTKrbglOdCUb7xhcCQsDDWcQfhw="; }; glib = { - # Completed source.url = "https://github.com/GNOME/glib.git"; source.rev = "2.58.3"; source.hash = "sha256-KmJXCJ6h2QhPyK1axk+Y9+yJzO0wnCczcogopxGShJc="; }; harfbuzz = { - # Completed source.url = "https://github.com/harfbuzz/harfbuzz.git"; source.rev = "8.0.1"; source.hash = "sha256-qh04AsZlymNcUtZ3fytA9+Jk5PjPYm8UH75kBqZNsw4="; @@ -63,37 +56,31 @@ source.hash = "sha256-SDXKam768xvZZvTbXe3sssvZyeLEEiY97Vrzx8hoc6g="; }; libjpeg-turbo = { - # Completed source.url = "https://github.com/libjpeg-turbo/libjpeg-turbo.git"; source.rev = "3.0.0"; source.hash = "sha256-mIeSBP65+rWOCRS/33MPqGUpemBee2qR45CZ6H00Hak="; }; libk2pdfopt = { - # Completed source.url = "https://github.com/koreader/libk2pdfopt.git"; source.rev = "60b82eeecf71d1776951da970fe8cd2cc5735ded"; source.hash = "sha256-9UcDr9e4GZCZ78moRs1ADAt4Xl7z3vR93KDexXEHvhw="; }; libpng = { - # Completed source.url = "https://github.com/glennrp/libpng.git"; source.rev = "v1.6.40"; source.hash = "sha256-Rad7Y5Z9PUCipBTQcB7LEP8fIVTG3JsnMeknUkZ/rRg="; }; libunibreak = { - # Completed source.url = "https://github.com/adah1972/libunibreak.git"; source.rev = "tags/libunibreak_5_1"; source.hash = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A="; }; libwebp = { - # Completed source.url = "https://github.com/webmproject/libwebp.git"; source.rev = "v1.3.1"; source.hash = "sha256-ddDL/nnBikbm6YznlyCcBgmq2Qzo0MjIwMzN4/kzWqk="; }; libzmq = { - # Completed source.url = "https://github.com/zeromq/libzmq"; source.rev = "883e95b22e0bffffa72312ea1fec76199afbe458"; source.hash = "sha256-R76EREtHsqcoKxKrgT8gfEf9pIWdLTBXvF9cDvjEf3E="; @@ -105,37 +92,31 @@ machineAgnostic = true; }; lodepng = { - # Completed source.url = "https://github.com/lvandeve/lodepng.git"; source.rev = "c18b949b71f45e78b1f9a28c5d458bce0da505d6"; source.hash = "sha256-AAw6I+MxDaxmGpjC5efxuBNw7Lx8FXwg2TEfl6LfPfQ="; }; lua-htmlparser = { - # Completed source.url = "https://github.com/msva/lua-htmlparser"; source.rev = "5ce9a775a345cf458c0388d7288e246bb1b82bff"; source.hash = "sha256-aSTLSfqz/MIDFVRwtBlDNBUhPb7KqOl32/Y62Hdec1s="; }; luajit = { - # Completed source.url = "https://github.com/LuaJIT/LuaJIT"; source.rev = "8635cbabf3094c4d8bd00578c7d812bea87bb2d3"; source.hash = "sha256-pfMNQFulW6AEwAVPxn9wUdbRg3ViHbGVCCke5NSIgTo="; }; lua-rapidjson = { - # Completed source.url = "https://github.com/xpol/lua-rapidjson"; source.rev = "242b40c8eaceb0cc43bcab88309736461cac1234"; source.hash = "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg="; }; luasec = { - # Completed source.url = "https://github.com/brunoos/luasec"; source.rev = "tags/v1.3.1"; source.hash = "sha256-3iYRNQoVk5HFjDSqRRmg1taSqeT2cHFil36vxjrEofo="; }; luasocket = { - # Completed source.url = "https://github.com/lunarmodules/luasocket"; source.rev = "8c2ff7217e2a205eb107a6f48b04ff1b2b3090a1"; source.hash = "sha256-Y35QYNLznQmErr6rIjxLzw0/6Y7y8TbzD4yaEdgEljA="; @@ -151,25 +132,21 @@ source.hash = "sha256-wb7ykJsndoq0DazHpfXieUcBBptowYqD/eTTN/EK/6g="; }; lunasvg = { - # Completed source.url = "https://github.com/sammycage/lunasvg.git"; source.rev = "59d6f6ba835c1b7c7a0f9d4ea540ec3981777885"; source.hash = "sha256-gW2ikakS6Omz5upmy26nAo/jkGHYO2kjlB3UmKJBh1k="; }; minizip = { - # Completed source.url = "https://github.com/nmoinvaz/minizip"; source.rev = "0b46a2b4ca317b80bc53594688883f7188ac4d08"; source.hash = "sha256-P/3MMMGYDqD9NmkYvw/thKpUNa3wNOSlBBjANHSonAg="; }; mupdf = { - # Completed source.url = "https://github.com/ArtifexSoftware/mupdf.git"; source.rev = "tags/1.13.0"; source.hash = "sha256-pQejRon9fO9A1mhz3oLjBr1j4HveDLcQIWjR1/Rpy5Q="; }; nanosvg = { - # Completed source.url = "https://github.com/memononen/nanosvg.git"; source.rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; source.hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; @@ -181,7 +158,6 @@ source.hash = "sha256-yjIpSbe5pt9sEV2MZYGztxejg/aBFfKO8ieRvoLN2KA="; }; openssl = { - # Completed source.url = "https://github.com/openssl/openssl.git"; source.rev = "OpenSSL_1_1_1u"; source.hash = "sha256-JOcUj4ovA6621+1k2HUsvhGX1B9BjvaMbCaSx680nSs="; @@ -203,19 +179,16 @@ source.hash = "sha256-FQvlrJ+Uy7+wtUxBuS5NdoToUwNRhYw2ju8Ya8MLyQw="; }; turbo = { - # Completed source.url = "https://github.com/kernelsauce/turbo"; source.rev = "tags/v2.1.3"; source.hash = "sha256-vBRkFdc5a0FIt15HBz3TnqMZ+GGsqjEefnfJEpuVTBs="; }; utf8proc = { - # Completed source.url = "https://github.com/JuliaStrings/utf8proc.git"; source.rev = "v2.8.0"; source.hash = "sha256-/lSD78kj133rpcSAOh8T8XFW/Z0c3JKkGQM5Z6DcMtU="; }; zstd = { - # Completed source.url = "https://github.com/facebook/zstd.git"; source.rev = "tags/v1.5.5"; source.hash = "sha256-tHHHIsQU7vJySrVhJuMKUSq11MzkmC+Pcsj00uFJdnQ="; @@ -237,7 +210,6 @@ hash = "sha256-x30NoxAq7JwH9DZx5gYR6/+JqZbvFZSXzo5Z0HV4axI="; }; libffi = { - # Completed url = "https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz"; hash = "sha256-1mxWrSWags8qnfxAizK/XaUjcVALhHRff7i2RXEt9nY="; }; @@ -246,7 +218,6 @@ hash = "sha256-zPU2YgpFRY0muoOIepg7loJwAekqE4R7ReSSXMiRMXg="; }; lpeg = { - # Completed url = "http://distcache.FreeBSD.org/ports-distfiles/lpeg-1.0.2.tar.gz"; hash = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; }; @@ -269,7 +240,6 @@ hash = "sha256-A9kIz1doz+a3rViMkhxu0hrKv7K3m3iNEzBFNQdkeu0="; }; zlib = { - # Completed url = "http://gentoo.osuosl.org/distfiles/zlib-1.2.13.tar.xz"; hash = "sha256-0Uw44xOvw1qah2Da3yYEL1HqD10VSwYwox2gVAEH+5g="; };