From 2f7dda4450092f9f3019d131784c4c098f30d6a8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 1 Apr 2022 08:45:47 +0300 Subject: [PATCH 1/2] ocrfeeder: 0.8.3 -> 0.8.5 --- pkgs/applications/graphics/ocrfeeder/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index da5f1c5dcc49..7319d4aa84e3 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "ocrfeeder"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529"; + sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0="; }; nativeBuildInputs = [ @@ -49,18 +49,13 @@ stdenv.mkDerivation rec { ])) ]; - # https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/22 - postConfigure = '' - substituteInPlace src/ocrfeeder/util/constants.py \ - --replace /usr/share/xml/iso-codes ${isocodes}/share/xml/iso-codes - ''; - enginesPath = lib.makeBinPath ([ tesseract4 ] ++ extraOcrEngines); preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${enginesPath}") + gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes") ''; meta = with lib; { From 84f98081dc5ec0992757cb5099b4c537a08a938b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 3 Apr 2022 22:30:50 +0300 Subject: [PATCH 2/2] ocrfeeder: Mark as broken due to upstream issue --- pkgs/applications/graphics/ocrfeeder/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 7319d4aa84e3..2cd3299c6175 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -64,5 +64,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; platforms = platforms.linux; + # Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83 + broken = true; }; }