forked from colin/nix-files
koreader-from-src: popen-noshell,turbo: populate more directly
This commit is contained in:
parent
373388c5b8
commit
58341b75f2
@ -172,6 +172,14 @@ let
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
popen-noshell-src-ko = fetchFromGitHub {
|
||||||
|
owner = "famzah";
|
||||||
|
repo = "popen-noshell";
|
||||||
|
name = "popen-noshell";
|
||||||
|
rev = "e715396a4951ee91c40a98d2824a130f158268bb";
|
||||||
|
hash = "sha256-JeBZMsg6ZUGSnyZ4eds4w63gM/L73EsAnLaHOPpL6iM=";
|
||||||
|
};
|
||||||
|
|
||||||
tesseract-src-ko = fetchFromGitHub {
|
tesseract-src-ko = fetchFromGitHub {
|
||||||
# TODO: try using nixpkgs' tesseract.src (i doubt it will work)
|
# TODO: try using nixpkgs' tesseract.src (i doubt it will work)
|
||||||
owner = "tesseract-ocr";
|
owner = "tesseract-ocr";
|
||||||
@ -181,6 +189,14 @@ let
|
|||||||
hash = "sha256-FQvlrJ+Uy7+wtUxBuS5NdoToUwNRhYw2ju8Ya8MLyQw=";
|
hash = "sha256-FQvlrJ+Uy7+wtUxBuS5NdoToUwNRhYw2ju8Ya8MLyQw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
turbo-src-ko = fetchFromGitHub {
|
||||||
|
owner = "kernelsauce";
|
||||||
|
repo = "turbo";
|
||||||
|
name = "turbo";
|
||||||
|
rev = "v2.1.3";
|
||||||
|
hash = "sha256-vBRkFdc5a0FIt15HBz3TnqMZ+GGsqjEefnfJEpuVTBs=";
|
||||||
|
};
|
||||||
|
|
||||||
# XXX: for some inscrutable reason, `enable52Compat` is *partially* broken, only when cross compiling.
|
# XXX: for some inscrutable reason, `enable52Compat` is *partially* broken, only when cross compiling.
|
||||||
# `table.unpack` is non-nil, but `table.pack` is nil.
|
# `table.unpack` is non-nil, but `table.pack` is nil.
|
||||||
# the normal path is for `enable52Compat` to set `env.NIX_CFLAGS_COMPILE = "-DLUAJIT_ENABLE_LUA52COMPAT";`
|
# the normal path is for `enable52Compat` to set `env.NIX_CFLAGS_COMPILE = "-DLUAJIT_ENABLE_LUA52COMPAT";`
|
||||||
@ -375,9 +391,11 @@ let
|
|||||||
CRYPTO_LIB="${lib.getLib openssl}/lib/libcrypto.so" \
|
CRYPTO_LIB="${lib.getLib openssl}/lib/libcrypto.so" \
|
||||||
PNG_LIB="${lib.getLib libpng}/lib/libpng.so" \
|
PNG_LIB="${lib.getLib libpng}/lib/libpng.so" \
|
||||||
PNG_DIR="${libAndDev libpng}" \
|
PNG_DIR="${libAndDev libpng}" \
|
||||||
|
POPEN_NOSHELL_DIR="$NIX_BUILD_TOP/popen-noshell" \
|
||||||
SQLITE_LIB="${lib.getLib sqlite}/lib/libsqlite3.so" \
|
SQLITE_LIB="${lib.getLib sqlite}/lib/libsqlite3.so" \
|
||||||
SQLITE_DIR="${lib.getDev sqlite}" \
|
SQLITE_DIR="${lib.getDev sqlite}" \
|
||||||
TESSERACT_DIR="$NIX_BUILD_TOP/tesseract" \
|
TESSERACT_DIR="$NIX_BUILD_TOP/tesseract" \
|
||||||
|
TURBO_DIR="$NIX_BUILD_TOP/turbo" \
|
||||||
UTF8PROC_LIB="${lib.getLib utf8proc}/lib/libutf8proc.so" \
|
UTF8PROC_LIB="${lib.getLib utf8proc}/lib/libutf8proc.so" \
|
||||||
UTF8PROC_DIR="${utf8procAll}" \
|
UTF8PROC_DIR="${utf8procAll}" \
|
||||||
ZLIB="${lib.getLib zlib}/lib/libz.so" \
|
ZLIB="${lib.getLib zlib}/lib/libz.so" \
|
||||||
@ -447,7 +465,9 @@ stdenv.mkDerivation rec {
|
|||||||
lunasvg-src-ko
|
lunasvg-src-ko
|
||||||
minizip-src-ko
|
minizip-src-ko
|
||||||
mupdf-src-ko
|
mupdf-src-ko
|
||||||
|
popen-noshell-src-ko
|
||||||
tesseract-src-ko
|
tesseract-src-ko
|
||||||
|
turbo-src-ko
|
||||||
] ++ (lib.mapAttrsToList
|
] ++ (lib.mapAttrsToList
|
||||||
(name: src: fetchgit (
|
(name: src: fetchgit (
|
||||||
{
|
{
|
||||||
@ -500,7 +520,7 @@ stdenv.mkDerivation rec {
|
|||||||
--replace-fail ' -rm ' ' # -rm'
|
--replace-fail ' -rm ' ' # -rm'
|
||||||
|
|
||||||
# make some sources writable (only the `sourceRoot` is writable by default)
|
# make some sources writable (only the `sourceRoot` is writable by default)
|
||||||
chmod -R u+w "$NIX_BUILD_TOP"/{fbink,kobo-usbms,leptonica,libk2pdfopt,lodepng,lunasvg,minizip,mupdf,tesseract}
|
chmod -R u+w "$NIX_BUILD_TOP"/{fbink,kobo-usbms,leptonica,libk2pdfopt,lodepng,lunasvg,minizip,mupdf,popen-noshell,tesseract,turbo}
|
||||||
|
|
||||||
# lots of places in Makefile.third (incorrectly) assume lib paths are relative to CURDIR,
|
# lots of places in Makefile.third (incorrectly) assume lib paths are relative to CURDIR,
|
||||||
# so link /nix into CURDIR to allow them to work anyway
|
# so link /nix into CURDIR to allow them to work anyway
|
||||||
@ -572,6 +592,8 @@ stdenv.mkDerivation rec {
|
|||||||
skip_download lunasvg
|
skip_download lunasvg
|
||||||
skip_download minizip
|
skip_download minizip
|
||||||
skip_download mupdf
|
skip_download mupdf
|
||||||
|
skip_download popen-noshell
|
||||||
|
skip_download turbo
|
||||||
|
|
||||||
# outDir should match OUTPUT_DIR in koreader-base
|
# outDir should match OUTPUT_DIR in koreader-base
|
||||||
outDir="$NIX_BUILD_TOP/koreader/base/build/${stdenv.hostPlatform.config}"
|
outDir="$NIX_BUILD_TOP/koreader/base/build/${stdenv.hostPlatform.config}"
|
||||||
|
@ -268,12 +268,12 @@ in
|
|||||||
# # TODO: i think we can use nixpkgs openssl, just lift lib/* up to the root of the package directory
|
# # TODO: i think we can use nixpkgs openssl, just lift lib/* up to the root of the package directory
|
||||||
# # package = lib.getLib openssl_1_1; # N.B.: requires building with `NIXPKGS_ALLOW_INSECURE=1 nix build --impure ...`
|
# # package = lib.getLib openssl_1_1; # N.B.: requires building with `NIXPKGS_ALLOW_INSECURE=1 nix build --impure ...`
|
||||||
# };
|
# };
|
||||||
popen-noshell = {
|
# popen-noshell = {
|
||||||
source.url = "https://github.com/famzah/popen-noshell.git";
|
# source.url = "https://github.com/famzah/popen-noshell.git";
|
||||||
source.rev = "e715396a4951ee91c40a98d2824a130f158268bb";
|
# source.rev = "e715396a4951ee91c40a98d2824a130f158268bb";
|
||||||
source.hash = "sha256-JeBZMsg6ZUGSnyZ4eds4w63gM/L73EsAnLaHOPpL6iM=";
|
# source.hash = "sha256-JeBZMsg6ZUGSnyZ4eds4w63gM/L73EsAnLaHOPpL6iM=";
|
||||||
# package: not in nixpkgs
|
# # package: not in nixpkgs
|
||||||
};
|
# };
|
||||||
# sdcv = {
|
# sdcv = {
|
||||||
# # upstream is (temporarily?) acquiring this via `download_project` machinery
|
# # upstream is (temporarily?) acquiring this via `download_project` machinery
|
||||||
# source.url = "https://github.com/Dushistov/sdcv.git";
|
# source.url = "https://github.com/Dushistov/sdcv.git";
|
||||||
@ -287,12 +287,12 @@ in
|
|||||||
# source.hash = "sha256-FQvlrJ+Uy7+wtUxBuS5NdoToUwNRhYw2ju8Ya8MLyQw=";
|
# source.hash = "sha256-FQvlrJ+Uy7+wtUxBuS5NdoToUwNRhYw2ju8Ya8MLyQw=";
|
||||||
# # package = tesseract; # i guess koreader's k2pdf also builds tessearct??
|
# # package = tesseract; # i guess koreader's k2pdf also builds tessearct??
|
||||||
# };
|
# };
|
||||||
turbo = {
|
# turbo = {
|
||||||
source.url = "https://github.com/kernelsauce/turbo";
|
# source.url = "https://github.com/kernelsauce/turbo";
|
||||||
source.rev = "tags/v2.1.3";
|
# source.rev = "tags/v2.1.3";
|
||||||
source.hash = "sha256-vBRkFdc5a0FIt15HBz3TnqMZ+GGsqjEefnfJEpuVTBs=";
|
# source.hash = "sha256-vBRkFdc5a0FIt15HBz3TnqMZ+GGsqjEefnfJEpuVTBs=";
|
||||||
# package = turbo; # nixpkgs' turbo is a totally different thing
|
# # package = turbo; # nixpkgs' turbo is a totally different thing
|
||||||
};
|
# };
|
||||||
# utf8proc = {
|
# utf8proc = {
|
||||||
# source.url = "https://github.com/JuliaStrings/utf8proc.git";
|
# source.url = "https://github.com/JuliaStrings/utf8proc.git";
|
||||||
# source.rev = "v2.9.0";
|
# source.rev = "v2.9.0";
|
||||||
|
Loading…
Reference in New Issue
Block a user