pdfmixtool: 1.1.1 -> 1.2.1

Diff: https://gitlab.com/scarpetta/pdfmixtool/-/compare/v1.1.1...1.2.1

pkgs/applications/office/pdfmixtool/default.nix

@@ -1,55 +1,41 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitLab,
-  fetchpatch,
-  fetchpatch2,
   cmake,
   pkg-config,
-  qtbase,
-  qttools,
+  qt6Packages,
   qpdf,
   podofo,
   imagemagick,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "pdfmixtool";
-  version = "1.1.1";
+  version = "1.2.1";
 
   src = fetchFromGitLab {
     owner = "scarpetta";
     repo = "pdfmixtool";
     rev = "v${version}";
-    hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
+    hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
     imagemagick
-    qtbase
-    qttools
+    qt6Packages.poppler
+    qt6Packages.qtbase
+    qt6Packages.qttools
     qpdf
     podofo
   ];
 
-  patches = [
-    # fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1
-    (fetchpatch {
-      url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff";
-      hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I=";
-    })
-    # https://gitlab.com/scarpetta/pdfmixtool/-/merge_requests/14
-    (fetchpatch2 {
-      url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/268291317ccd1805dc1c801ff88641ba06c6a7f0.patch";
-      hash = "sha256-56bDoFtE+IOQHcV9xPfyrgYYFvTfB0QiLIfRl91irb0=";
-    })
-  ];
-
   meta = with lib; {
     description = "Application to split, merge, rotate and mix PDF files";
     mainProgram = "pdfmixtool";

pkgs/top-level/all-packages.nix

@@ -11865,7 +11865,7 @@ with pkgs;
 
   pcmanfm-qt = lxqt.pcmanfm-qt;
 
-  pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { };
+  pdfmixtool = callPackage ../applications/office/pdfmixtool { };
 
   pijuice = with python3Packages; toPythonApplication pijuice;