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

koreader-from-src: get the entire buildPhase working

Browse Source 
fails in install: bash: line 1: /build/koreader/platform/debian/do_debian_package.sh: cannot execute: required file not found
This commit is contained in:
Colin
2023-07-21 09:53:46 +00:00
parent e29361f05e
commit 9a2f648463
2 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,11 +191,12 @@
source.rev = "e715396a4951ee91c40a98d2824a130f158268bb";
source.hash = "sha256-JeBZMsg6ZUGSnyZ4eds4w63gM/L73EsAnLaHOPpL6iM=";
};
sdvc = {
source.url = "https://github.com/Dushistov/sdcv.git";
source.rev = "6e36e7730caf07b6cd0bfa265cdf9b5e31e7acad";
source.hash = "sha256-pPaT9tB39dd+VyE21KSjMpON99KjOxQ8Hi8+ZgFsuUY=";
};
# sdcv = {
# # upstream is (temporarily?) acquiring this via `download_project` machinery
# source.url = "https://github.com/Dushistov/sdcv.git";
# source.rev = "6e36e7730caf07b6cd0bfa265cdf9b5e31e7acad";
# source.hash = "sha256-pPaT9tB39dd+VyE21KSjMpON99KjOxQ8Hi8+ZgFsuUY=";
# };
tesseract = {
source.url = "https://github.com/tesseract-ocr/tesseract.git";
source.rev = "60176fc5ae5e7f6bdef60c926a4b5ea03de2bfa7";
@@ -249,10 +250,16 @@
url = "http://distcache.FreeBSD.org/ports-distfiles/lpeg-1.0.2.tar.gz";
hash = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
};
# sdcv = TODO (uses download_project)
# sdl2 = { # TODO (uses download_project)
# url = "https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz";
# };
sdcv = {
# TODO: if this form of substitution works, i could optionally patch in *all* deps
# using the `file://@foo@` ExternalProject_Add syntax
url = "https://github.com/Dushistov/sdcv/archive/6e36e7730caf07b6cd0bfa265cdf9b5e31e7acad.tar.gz";
hash = "sha256-bzCpzassIDY/g7NO71PoWNayLAyEaz1haY9vMFk4hqU=";
};
sdl2 = {
url = "https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz";
hash = "sha256-SXfOulwAVNvmwvEUZBrO1DzjvytB6mS2o3LWuhKcsV0=";
};
sqlite = {
url = "https://www.sqlite.org/2023/sqlite-autoconf-3420000.tar.gz";
hash = "sha256-erz9FhxuJ0LKXGwIldH4U8lA8gMwSgtJ2k4eyl0IjKY=";

30
pkgs/additional/koreader-from-src/vendor-external-projects.patch
View File

@@ -63,6 +63,36 @@ index b7345e61..c5859b68 100644
URL_MD5 d342571886f1abcb7afe6a83d024d583
BUILD_IN_SOURCE 1
PATCH_COMMAND COMMAND ${PATCH_CMD}
diff --git a/base/thirdparty/sdcv/CMakeLists.txt b/base/thirdparty/sdcv/CMakeLists.txt
index f19d441f..54394e0a 100644
--- a/base/thirdparty/sdcv/CMakeLists.txt
+++ b/base/thirdparty/sdcv/CMakeLists.txt
@@ -92,11 +92,7 @@ ko_write_gitclone_script(
download_project(
PROJ ${PROJECT_NAME}
- GIT_REPOSITORY
- https://github.com/Dushistov/sdcv.git
- GIT_TAG
- ${SDCV_GIT_COMMIT}
- #DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
+ URL file://@sdcv@
PATCH_COMMAND COMMAND ${PATCH_CMD1} COMMAND ${PATCH_CMD2}
)
diff --git a/base/thirdparty/sdl2/CMakeLists.txt b/base/thirdparty/sdl2/CMakeLists.txt
index a963385c..6376cfe8 100644
--- a/base/thirdparty/sdl2/CMakeLists.txt
+++ b/base/thirdparty/sdl2/CMakeLists.txt
@@ -19,7 +19,7 @@ set(SDL2_VER "2.28.1")
set(SDL2_MD5 "ccd2cd02b2ad4f71c2588747028953c3")
download_project(
PROJ ${PROJECT_NAME}
- URL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VER}/SDL2-${SDL2_VER}.tar.gz
+ URL file://@sdl2@
URL_MD5 ${SDL2_MD5}
PATCH_COMMAND COMMAND ${PATCH_CMD}
)
diff --git a/base/thirdparty/sqlite/CMakeLists.txt b/base/thirdparty/sqlite/CMakeLists.txt
index 0353b145..9de56105 100644
--- a/base/thirdparty/sqlite/CMakeLists.txt