From 0eedcb2eb0462808023694ee4d93f7e80798c97f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 4 Aug 2024 01:16:41 +0200
Subject: [PATCH 1/2] photoqt: move to pkgs/by-name, format

---
 .../ph/photoqt/package.nix}                   | 65 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 30 insertions(+), 39 deletions(-)
 rename pkgs/{applications/graphics/photoqt/default.nix => by-name/ph/photoqt/package.nix} (69%)

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/by-name/ph/photoqt/package.nix
similarity index 69%
rename from pkgs/applications/graphics/photoqt/default.nix
rename to pkgs/by-name/ph/photoqt/package.nix
index e3c8ce53bbd2..7401d49539bb 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/by-name/ph/photoqt/package.nix
@@ -1,27 +1,18 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, extra-cmake-modules
-, qttools
-, wrapQtAppsHook
-, exiv2
-, graphicsmagick
-, libarchive
-, libraw
-, mpv
-, poppler
-, pugixml
-, qtbase
-, qtcharts
-, qtdeclarative
-, qtimageformats
-, qtlocation
-, qtmultimedia
-, qtpositioning
-, qtsvg
-, zxing-cpp
-, qtwayland
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  extra-cmake-modules,
+  exiv2,
+  graphicsmagick,
+  libarchive,
+  libraw,
+  mpv,
+  pugixml,
+  qt6,
+  qt6Packages,
+  zxing-cpp,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,8 +27,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -46,20 +37,18 @@ stdenv.mkDerivation rec {
     libarchive
     libraw
     mpv
-    poppler
     pugixml
-    qtbase
-    qtcharts
-    qtdeclarative
-    qtimageformats
-    qtlocation
-    qtmultimedia
-    qtpositioning
-    qtsvg
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtdeclarative
+    qt6.qtimageformats
+    qt6.qtlocation
+    qt6.qtmultimedia
+    qt6.qtpositioning
+    qt6.qtsvg
+    qt6Packages.poppler
     zxing-cpp
-  ] ++ lib.optionals stdenv.isLinux [
-    qtwayland
-  ];
+  ] ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ];
 
   cmakeFlags = [
     (lib.cmakeBool "DEVIL" false)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 543c60b3298e..2140c8cdf6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33076,7 +33076,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 { };
 

From 3f272cbdea43dbc0639bfa41484a10967046536e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 4 Aug 2024 01:16:53 +0200
Subject: [PATCH 2/2] photoqt: 4.5 -> 4.6

---
 pkgs/by-name/ph/photoqt/package.nix | 45 ++++++++++++++++-------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix
index 7401d49539bb..ff80e9bc1542 100644
--- a/pkgs/by-name/ph/photoqt/package.nix
+++ b/pkgs/by-name/ph/photoqt/package.nix
@@ -17,11 +17,11 @@
 
 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 = [
@@ -31,30 +31,35 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    exiv2
-    graphicsmagick
-    libarchive
-    libraw
-    mpv
-    pugixml
-    qt6.qtbase
-    qt6.qtcharts
-    qt6.qtdeclarative
-    qt6.qtimageformats
-    qt6.qtlocation
-    qt6.qtmultimedia
-    qt6.qtpositioning
-    qt6.qtsvg
-    qt6Packages.poppler
-    zxing-cpp
-  ] ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ];
+  buildInputs =
+    [
+      exiv2
+      graphicsmagick
+      libarchive
+      libraw
+      pugixml
+      qt6.qtbase
+      qt6.qtcharts
+      qt6.qtdeclarative
+      qt6.qtimageformats
+      qt6.qtlocation
+      qt6.qtmultimedia
+      qt6.qtpositioning
+      qt6.qtsvg
+      qt6Packages.poppler
+      zxing-cpp
+    ]
+    ++ 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";