Unverified Commit 0d404d54 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #279598 from thiagokokada/bump-mcomix 

mcomix: 2.2.1 -> 3.0.0
parents b817555a 42a3cb8e

pkgs/applications/graphics/mcomix/default.nix→pkgs/by-name/mc/mcomix/package.nix

+28 −12
Original line number Diff line number Diff line
@@ -9,36 +9,52 @@ 
, wrapGAppsHook



  # Recommended Dependencies:

, lhasa

, mupdf

, p7zip

, unrar

, chardetSupport ? true

, pdfSupport ? true

, unrarSupport ? false  # unfree software

}:



python3.pkgs.buildPythonApplication rec {

  pname = "mcomix";

  version = "2.2.1";

  version = "3.0.0";

  pyproject = true;



  src = fetchurl {

    url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz";

    hash = "sha256-fmnlPhNCN6YR3lW2YCMEAbEiWVigcfFDq1tDQ1eTNkA=";

    url = "mirror://sourceforge/mcomix/mcomix-${version}.tar.gz";

    hash = "sha256-InDEPXXih49k5MiG1bATElxCiUs2RZTV7JeRVMTeoAQ=";

  };



  buildInputs = [ gtk3 gdk-pixbuf ];

  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

  propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);

  buildInputs = [

    gtk3

    gdk-pixbuf

  ];



  # Tests are broken

  nativeBuildInputs = [

    gobject-introspection

    python3.pkgs.setuptools

    wrapGAppsHook

  ];



  propagatedBuildInputs = with python3.pkgs; [

    pillow

    pycairo

    pygobject3

  ]

  ++ lib.optionals chardetSupport [ chardet ]

  ++ lib.optionals pdfSupport [ pymupdf ];



  # No tests included in .tar.gz

  doCheck = false;



  # prevent double wrapping

  # Prevent double wrapping

  dontWrapGApps = true;



  preFixup = ''

    makeWrapperArgs+=(

      "''${gappsWrapperArgs[@]}"

      "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}"

      "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip ] ++ lib.optional unrarSupport unrar)}"

    )

  '';

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -33540,8 +33540,6 @@ with pkgs; 














  mbrola = callPackage ../applications/audio/mbrola { };



























  mcomix = callPackage ../applications/graphics/mcomix { };



























  mcpp = callPackage ../development/compilers/mcpp { };





























  mda_lv2 = callPackage ../applications/audio/mda-lv2 { };