From 195833f20c850013446ada0cec4413f0c38d71f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 14 Aug 2022 20:03:31 +1000 Subject: [PATCH] tesseract5: fix darwin compilation --- pkgs/applications/graphics/tesseract/default.nix | 6 ++++-- pkgs/applications/graphics/tesseract/tesseract5.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index dc5f97318708..70649d633b85 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,9 +1,11 @@ -{ callPackage, lowPrio }: +{ callPackage, lowPrio, Accelerate, CoreGraphics, CoreVideo}: let base3 = callPackage ./tesseract3.nix {}; base4 = callPackage ./tesseract4.nix {}; - base5 = callPackage ./tesseract5.nix {}; + base5 = callPackage ./tesseract5.nix { + inherit Accelerate CoreGraphics CoreVideo; + }; languages = callPackage ./languages.nix {}; in { diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index dd4d6cb2791d..244eb1e53e40 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: +, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch +, Accelerate, CoreGraphics, CoreVideo +}: stdenv.mkDerivation rec { pname = "tesseract"; @@ -27,6 +29,10 @@ stdenv.mkDerivation rec { icu pango opencl-headers + ] ++ lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo ]; meta = { @@ -34,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ anselmschueler ]; - platforms = with lib.platforms; linux ++ darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30dcfec3cc20..c08e0e514eca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30829,7 +30829,9 @@ with pkgs; termtosvg = callPackage ../tools/misc/termtosvg { }; - inherit (callPackage ../applications/graphics/tesseract {}) + inherit (callPackage ../applications/graphics/tesseract { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; + }) tesseract3 tesseract4 tesseract5;