Merge pull request #315933 from zendo/upd/mangareader

mangareader: 2.1.0 -> 2.2.1

pkgs/applications/graphics/mangareader/default.nix

@@ -1,54 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, wrapQtAppsHook
-, extra-cmake-modules
-, cmake
-, kio
-, ki18n
-, kxmlgui
-, kconfig
-, karchive
-, kcoreaddons
-, kconfigwidgets
-, nix-update-script
-}:
-
-stdenv.mkDerivation rec {
-  pname = "mangareader";
-  version = "2.1.0";
-
-  src = fetchFromGitHub {
-    owner = "g-fb";
-    repo = pname;
-    rev = version;
-    hash = "sha256-YZZcp+HS/P/GxWYyOpO35nByJSzv4HahzzrZSVRcCRs=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    kio
-    ki18n
-    kxmlgui
-    kconfig
-    karchive
-    kcoreaddons
-    kconfigwidgets
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = with lib; {
-    description = "Qt manga reader for local files";
-    homepage = "https://github.com/g-fb/mangareader";
-    changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
-    platforms = platforms.linux;
-    license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ];
-    maintainers = with maintainers; [ zendo ];
-  };
-}

pkgs/by-name/ma/mangareader/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  kdePackages,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mangareader";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "g-fb";
+    repo = "mangareader";
+    rev = version;
+    hash = "sha256-XX0VaXVYmAs5vmgwslflKIYx1peITp4VmReLkv1nV3I=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    kdePackages.extra-cmake-modules
+    kdePackages.wrapQtAppsHook
+  ];
+
+  buildInputs = with kdePackages; [
+    qtbase
+    kio
+    ki18n
+    kxmlgui
+    kconfig
+    karchive
+    kcoreaddons
+    kconfigwidgets
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Qt manga reader for local files";
+    homepage = "https://github.com/g-fb/mangareader";
+    changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
+    mainProgram = "mangareader";
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [
+      gpl3Plus
+      cc-by-sa-40
+    ];
+    maintainers = with lib.maintainers; [ zendo ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -10474,8 +10474,6 @@ with pkgs;
 
   mandoc = callPackage ../tools/misc/mandoc { };
 
-  mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { };
-
   mangohud = callPackage ../tools/graphics/mangohud {
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
     mangohud32 = pkgsi686Linux.mangohud;