colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #278591: tesseract4: fix gcc-13 build failure

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2024-01-07 09:26:16 +01:00
commit 65f349a068
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/tesseract/tesseract4.nix
View File

@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
# great, but tesseract4's days are numbered anyway
postPatch = ''
sed -i '/allheaders.h/a#include "pix_internal.h"' src/textord/devanagari_processing.cpp
# gcc-13 compat fix, simulate this upstream patch:
# https://github.com/tesseract-ocr/tesseract/commit/17e795aaae7d40dbcb7d3365835c2f55ecc6355d.patch
# https://github.com/tesseract-ocr/tesseract/commit/c0db7b7e930322826e09981360e39fdbd16cc9b0.patch
sed -i src/ccutil/helpers.h -e '1i #include <climits>'
sed -i src/ccutil/helpers.h -e '1i #include <cstdint>'
sed -i src/dict/matchdefs.h -e '1i #include <cstdint>'
'';
enableParallelBuilding = true;

7
pkgs/top-level/all-packages.nix
View File

@ -35746,10 +35746,9 @@ with pkgs;
tessen = callPackage ../tools/security/tessen { };
inherit (lib.mapAttrs (_: disable-warnings-if-gcc13)
(callPackage ../applications/graphics/tesseract {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
}))
inherit (callPackage ../applications/graphics/tesseract {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
})
tesseract3
tesseract4
tesseract5;