about summary refs log tree commit diff
path: root/pkgs/by-name/mc
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2024-01-08 12:51:26 +0000
committerThiago Kenji Okada <thiagokokada@gmail.com>2024-01-08 13:23:31 +0000
commiteb32f20194c46129d09d7039037beb6883071997 (patch)
tree085c4689ed8beebea3c74ef8fe95e5700b9d16cb /pkgs/by-name/mc
parentb2d520bd14e5d6f0eb5ff48617c5013b0cc6c3a3 (diff)
downloadnixlib-eb32f20194c46129d09d7039037beb6883071997.tar
nixlib-eb32f20194c46129d09d7039037beb6883071997.tar.gz
nixlib-eb32f20194c46129d09d7039037beb6883071997.tar.bz2
nixlib-eb32f20194c46129d09d7039037beb6883071997.tar.lz
nixlib-eb32f20194c46129d09d7039037beb6883071997.tar.xz
nixlib-eb32f20194c46129d09d7039037beb6883071997.tar.zst
nixlib-eb32f20194c46129d09d7039037beb6883071997.zip
mcomix: 2.2.1 -> 3.0.0
Diffstat (limited to 'pkgs/by-name/mc')
-rw-r--r--pkgs/by-name/mc/mcomix/package.nix40
1 files changed, 28 insertions, 12 deletions
diff --git a/pkgs/by-name/mc/mcomix/package.nix b/pkgs/by-name/mc/mcomix/package.nix
index aa022cf232ab..2d1b6ab495e7 100644
--- a/pkgs/by-name/mc/mcomix/package.nix
+++ b/pkgs/by-name/mc/mcomix/package.nix
@@ -8,9 +8,7 @@
 , testers
 , wrapGAppsHook
 
-# Recommended Dependencies:
-, lhasa
-, mupdf
+  # Recommended Dependencies:
 , p7zip
 , unrar
 , unrarSupport ? false  # unfree software
@@ -18,27 +16,45 @@
 
 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; [
+    # Runtime dependencies
+    pillow
+    pycairo
+    pygobject3
+    # Optional dependencies
+    chardet
+    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)}"
     )
   '';