Commit 9f569e64 authored by dansbandit's avatar dansbandit Committed by Matthieu Coudron
Browse files

gImageReader: 3.4.2 -> unstable-2025-06-04, add support for Qt

parent 4bfe605e

pkgs/by-name/gi/gImageReader/package.nix

+48 −31
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
  json-glib,

  ninja,

  python3,

  doxygen,

  enchant,



  # Gtk deps

  # upstream gImagereader supports Qt too
@@ -28,21 +30,24 @@ 
  gtkspell3,

  gtkspellmm,

  cairomm,

  kdePackages,

  qt6Packages,

  withQt6 ? false,

  wrapQtAppsHook ? null,

}:



let

  variant = "gtk";

  pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]);

in

stdenv.mkDerivation rec {

  pname = "gImageReader";

  version = "3.4.2";

  version = "5aff249fdc119caa1464af9405259799b4f69d8b";



  src = fetchFromGitHub {

    owner = "manisandro";

    repo = "gImageReader";

    rev = "v${version}";

    sha256 = "sha256-yBkVeufRRoSAc20/8mV39widBPloHFz12K7B4Y9xiWg=";

    rev = "${version}";

    sha256 = "sha256-xS63iGY1yf0NEnGuss0sme1vSYd2L3sOUd/g8yyPn1k=";

  };



  nativeBuildInputs = [
@@ -51,13 +56,13 @@ stdenv.mkDerivation rec { 
    intltool

    pkg-config

    pythonEnv



    # Gtk specific

    wrapGAppsHook3

    enchant

    gobject-introspection

  ];

    wrapGAppsHook3

  ] ++ lib.optionals withQt6 [ qt6Packages.wrapQtAppsHook ];



  buildInputs = [

  buildInputs =

    [

      libxmlxx3

      libzip

      libuuid
@@ -67,24 +72,36 @@ stdenv.mkDerivation rec { 
      djvulibre

      tesseract

      poppler



    # Gtk specific

      doxygen

      cairomm

      gtkmm3

    gtkspell3

    gtkspellmm

      gtksourceview3

      gtksourceviewmm

    cairomm

      gtkspell3

      gtkspellmm

      json-glib

  ];

    ]

    ++ lib.optionals withQt6 (

      with qt6Packages;

      [

        kdePackages.poppler

        qtbase

        qtspell

        qttools

        quazip

      ]

    );



  # interface type can be where <type> is either gtk, qt5, qt4

  cmakeFlags = [ "-DINTERFACE_TYPE=${variant}" ];

  # interface type can be where <type> is either gtk, qt6

  cmakeFlags = [

    "-DINTERFACE_TYPE=gtk"

  ] ++ lib.optionals withQt6 [ "-DINTERFACE_TYPE=qt6 -DQT_VER=6" ];



  meta = with lib; {

    description = "Simple Gtk/Qt front-end to tesseract-ocr";

    mainProgram = "gimagereader-gtk";

    mainProgram = if withQt6 then "gImageReader-qt6" else "gImageReader";

    homepage = "https://github.com/manisandro/gImageReader";

    changelog = "https://github.com/manisandro/gImageReader/blob/${version}/NEWS";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ teto ];

    platforms = platforms.linux;

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -12304,6 +12304,10 @@ with pkgs; 
  geany = callPackage ../applications/editors/geany { };

  geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };













  gImageReader-qt = qt6Packages.callPackage ../by-name/gi/gImageReader/package.nix {













    withQt6 = true;













  };



























  gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {















    unwrapped = callPackage ../applications/radio/gnuradio {















      python = python311;