ocrmypdf: prefer patch + substituteAll

This commit is contained in:
Will Dietz 2020-01-21 18:14:49 -06:00
parent 24c14a8fc9
commit 6b1937818e
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
2 changed files with 20 additions and 5 deletions

View File

@ -10,6 +10,7 @@
, stdenv , stdenv
, tesseract4 , tesseract4
, unpaper , unpaper
, substituteAll
}: }:
let let
@ -68,11 +69,12 @@ in buildPythonApplication rec {
setuptools setuptools
] ++ runtimeDeps; ] ++ runtimeDeps;
postPatch = '' patches = [
substituteInPlace src/ocrmypdf/leptonica.py \ (substituteAll {
--replace '_libpath = find_library(libname)' \ src = ./liblept.patch;
'_libpath = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"' liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
''; })
];
# The tests take potentially 20+ minutes, depending on machine # The tests take potentially 20+ minutes, depending on machine
doCheck = false; doCheck = false;

View File

@ -0,0 +1,13 @@
diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py
index 328b063..b993cc9 100644
--- a/src/ocrmypdf/leptonica.py
+++ b/src/ocrmypdf/leptonica.py
@@ -46,7 +46,7 @@ if os.name == 'nt':
os.environ['PATH'] = shim_paths_with_program_files()
else:
libname = 'lept'
-_libpath = find_library(libname)
+_libpath = '@liblept@'
if not _libpath:
raise MissingDependencyError(
"""