photoqt: move to pkgs/by-name, format

This commit is contained in:
Weijia Wang
2024-08-04 01:16:41 +02:00
parent ad42a76b4f
commit 0eedcb2eb0
2 changed files with 30 additions and 39 deletions
@@ -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)
+3 -1
View File
@@ -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 { };