diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/by-name/ph/photoqt/package.nix similarity index 56% rename from pkgs/applications/graphics/photoqt/default.nix rename to pkgs/by-name/ph/photoqt/package.nix index e3c8ce53bbd2..ff80e9bc1542 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -1,71 +1,65 @@ -{ 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 { 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 - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; - buildInputs = [ - exiv2 - graphicsmagick - libarchive - libraw - mpv - poppler - pugixml - qtbase - qtcharts - qtdeclarative - qtimageformats - qtlocation - qtmultimedia - qtpositioning - qtsvg - zxing-cpp - ] ++ lib.optionals stdenv.isLinux [ - 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b53cea41ec82..d1b6462f590b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { };