colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #279598 from thiagokokada/bump-mcomix

Browse Source 
mcomix: 2.2.1 -> 3.0.0
This commit is contained in:
Thiago Kenji Okada 2024-01-08 17:46:32 +00:00 committed by GitHub
commit 0d404d54b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,37 +8,53 @@
, testers , testers
, wrapGAppsHook , wrapGAppsHook
# Recommended Dependencies: # Recommended Dependencies:
, lhasa
, mupdf
, p7zip , p7zip
, unrar , unrar
, chardetSupport ? true
, pdfSupport ? true
, unrarSupport ? false # unfree software , unrarSupport ? false # unfree software
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "mcomix"; pname = "mcomix";
version = "2.2.1"; version = "3.0.0";
pyproject = true;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/mcomix/mcomix-${version}.tar.gz";
hash = "sha256-fmnlPhNCN6YR3lW2YCMEAbEiWVigcfFDq1tDQ1eTNkA="; hash = "sha256-InDEPXXih49k5MiG1bATElxCiUs2RZTV7JeRVMTeoAQ=";
}; };
buildInputs = [ gtk3 gdk-pixbuf ]; buildInputs = [
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; gtk3
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); 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; doCheck = false;
# prevent double wrapping # Prevent double wrapping
dontWrapGApps = true; dontWrapGApps = true;
preFixup = '' preFixup = ''
makeWrapperArgs+=( makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
"--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip ] ++ lib.optional unrarSupport unrar)}"
) )
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -33540,8 +33540,6 @@ with pkgs;
mbrola = callPackage ../applications/audio/mbrola { }; mbrola = callPackage ../applications/audio/mbrola { };
mcomix = callPackage ../applications/graphics/mcomix { };
mcpp = callPackage ../development/compilers/mcpp { }; mcpp = callPackage ../development/compilers/mcpp { };
mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { };