nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-24 22:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tesseract4: fix gcc-13 build failure

Browse Source 
Without the change `tesseract4` fails the build on `staging-next` as
https://hydra.nixos.org/build/245356748:

    In file included from points.cpp:24:
    ../../src/ccutil/helpers.h:40:17: error: 'uint64_t' has not been declared
       40 |   void set_seed(uint64_t seed) {
          |                 ^~~~~~~~
This commit is contained in:
Sergei Trofimovich 2024-01-03 22:52:09 +00:00
parent 307002948d
commit 03b5cd0858
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

@ -35757,10 +35757,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;