Merge pull request #332100 from wegank/photoqt-bump

photoqt: 4.5 -> 4.6

pkgs/by-name/ph/photoqt/package.nix

@@ -1,71 +1,65 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchurl
+  stdenv,
-, cmake
+  fetchurl,
-, extra-cmake-modules
+  cmake,
-, qttools
+  extra-cmake-modules,
-, wrapQtAppsHook
+  exiv2,
-, exiv2
+  graphicsmagick,
-, graphicsmagick
+  libarchive,
-, libarchive
+  libraw,
-, libraw
+  mpv,
-, mpv
+  pugixml,
-, poppler
+  qt6,
-, pugixml
+  qt6Packages,
-, qtbase
+  zxing-cpp,
-, qtcharts
-, qtdeclarative
-, qtimageformats
-, qtlocation
-, qtmultimedia
-, qtpositioning
-, qtsvg
-, zxing-cpp
-, qtwayland
 }:
 
 stdenv.mkDerivation rec {
   pname = "photoqt";
-  version = "4.5";
+  version = "4.6";
 
   src = fetchurl {
     url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    hash = "sha256-QFziMNRhiM4LaNJ8RkJ0iCq/8J82wn0F594qJeSN3Lw=";
+    hash = "sha256-5VbGMJ1B9yDbTiri7SZ+r+c9LdfG/C1c0/01QBUvbCY=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    qttools
+    qt6.qttools
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
+  buildInputs =
-    exiv2
+    [
-    graphicsmagick
+      exiv2
-    libarchive
+      graphicsmagick
-    libraw
+      libarchive
-    mpv
+      libraw
-    poppler
+      pugixml
-    pugixml
+      qt6.qtbase
-    qtbase
+      qt6.qtcharts
-    qtcharts
+      qt6.qtdeclarative
-    qtdeclarative
+      qt6.qtimageformats
-    qtimageformats
+      qt6.qtlocation
-    qtlocation
+      qt6.qtmultimedia
-    qtmultimedia
+      qt6.qtpositioning
-    qtpositioning
+      qt6.qtsvg
-    qtsvg
+      qt6Packages.poppler
-    zxing-cpp
+      zxing-cpp
-  ] ++ lib.optionals stdenv.isLinux [
+    ]
-    qtwayland
+    ++ lib.optionals stdenv.isLinux [
-  ];
+      mpv
+      qt6.qtwayland
+    ];
 
   cmakeFlags = [
     (lib.cmakeBool "DEVIL" false)
     (lib.cmakeBool "CHROMECAST" false)
     (lib.cmakeBool "FREEIMAGE" false)
     (lib.cmakeBool "IMAGEMAGICK" false)
+    (lib.cmakeBool "VIDEO_MPV" (!stdenv.isDarwin))
   ];
 
   env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick";

pkgs/top-level/all-packages.nix

@@ -32891,7 +32891,9 @@ with pkgs;
 
   phantomsocks = callPackage ../tools/networking/phantomsocks { };
 
-  photoqt = qt6Packages.callPackage ../applications/graphics/photoqt { };
+  photoqt = callPackage ../by-name/ph/photoqt/package.nix {
+    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+  };
 
   photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };