Merge pull request #186611 from viraptor/tesseract-5-darwin

authored by Sandro and committed by GitHub d70ce02b c59d3005

+15 -5
+4 -2
pkgs/applications/graphics/tesseract/default.nix
··· 1 - { callPackage, lowPrio }: 1 + { callPackage, lowPrio, Accelerate, CoreGraphics, CoreVideo}: 2 2 3 3 let 4 4 base3 = callPackage ./tesseract3.nix {}; 5 5 base4 = callPackage ./tesseract4.nix {}; 6 - base5 = callPackage ./tesseract5.nix {}; 6 + base5 = callPackage ./tesseract5.nix { 7 + inherit Accelerate CoreGraphics CoreVideo; 8 + }; 7 9 languages = callPackage ./languages.nix {}; 8 10 in 9 11 {
+8 -2
pkgs/applications/graphics/tesseract/tesseract5.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config 2 - , leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: 2 + , leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch 3 + , Accelerate, CoreGraphics, CoreVideo 4 + }: 3 5 4 6 stdenv.mkDerivation rec { 5 7 pname = "tesseract"; ··· 27 29 icu 28 30 pango 29 31 opencl-headers 32 + ] ++ lib.optionals stdenv.isDarwin [ 33 + Accelerate 34 + CoreGraphics 35 + CoreVideo 30 36 ]; 31 37 32 38 meta = { ··· 34 40 homepage = "https://github.com/tesseract-ocr/tesseract"; 35 41 license = lib.licenses.asl20; 36 42 maintainers = with lib.maintainers; [ anselmschueler ]; 37 - platforms = with lib.platforms; linux ++ darwin; 43 + platforms = lib.platforms.unix; 38 44 }; 39 45 }
+3 -1
pkgs/top-level/all-packages.nix
··· 31058 31058 31059 31059 termtosvg = callPackage ../tools/misc/termtosvg { }; 31060 31060 31061 - inherit (callPackage ../applications/graphics/tesseract {}) 31061 + inherit (callPackage ../applications/graphics/tesseract { 31062 + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; 31063 + }) 31062 31064 tesseract3 31063 31065 tesseract4 31064 31066 tesseract5;