diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2024-01-03 22:52:09 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2024-01-03 22:52:09 +0000 |
commit | 03b5cd0858c204b873d4bbd87bfedbd68a76859c (patch) | |
tree | 263a10c0b82888951b6b5d8f5327c59cb81ab909 | |
parent | 307002948de4dd54437293de0d6a629d5478668b (diff) |
tesseract4: fix `gcc-13` build failure
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) { | ^~~~~~~~
-rw-r--r-- | pkgs/applications/graphics/tesseract/tesseract4.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index aecdf58186d05..5bd682988526a 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c697a6e2b057..75050a2a469fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |