Skip to content

Commit 0eedcb2

Browse files
committed
photoqt: move to pkgs/by-name, format
1 parent ad42a76 commit 0eedcb2

File tree

2 files changed

+30
-39
lines changed

2 files changed

+30
-39
lines changed

pkgs/applications/graphics/photoqt/default.nix renamed to pkgs/by-name/ph/photoqt/package.nix

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
1-
{ lib
2-
, stdenv
3-
, fetchurl
4-
, cmake
5-
, extra-cmake-modules
6-
, qttools
7-
, wrapQtAppsHook
8-
, exiv2
9-
, graphicsmagick
10-
, libarchive
11-
, libraw
12-
, mpv
13-
, poppler
14-
, pugixml
15-
, qtbase
16-
, qtcharts
17-
, qtdeclarative
18-
, qtimageformats
19-
, qtlocation
20-
, qtmultimedia
21-
, qtpositioning
22-
, qtsvg
23-
, zxing-cpp
24-
, qtwayland
1+
{
2+
lib,
3+
stdenv,
4+
fetchurl,
5+
cmake,
6+
extra-cmake-modules,
7+
exiv2,
8+
graphicsmagick,
9+
libarchive,
10+
libraw,
11+
mpv,
12+
pugixml,
13+
qt6,
14+
qt6Packages,
15+
zxing-cpp,
2516
}:
2617

2718
stdenv.mkDerivation rec {
@@ -36,8 +27,8 @@ stdenv.mkDerivation rec {
3627
nativeBuildInputs = [
3728
cmake
3829
extra-cmake-modules
39-
qttools
40-
wrapQtAppsHook
30+
qt6.qttools
31+
qt6.wrapQtAppsHook
4132
];
4233

4334
buildInputs = [
@@ -46,20 +37,18 @@ stdenv.mkDerivation rec {
4637
libarchive
4738
libraw
4839
mpv
49-
poppler
5040
pugixml
51-
qtbase
52-
qtcharts
53-
qtdeclarative
54-
qtimageformats
55-
qtlocation
56-
qtmultimedia
57-
qtpositioning
58-
qtsvg
41+
qt6.qtbase
42+
qt6.qtcharts
43+
qt6.qtdeclarative
44+
qt6.qtimageformats
45+
qt6.qtlocation
46+
qt6.qtmultimedia
47+
qt6.qtpositioning
48+
qt6.qtsvg
49+
qt6Packages.poppler
5950
zxing-cpp
60-
] ++ lib.optionals stdenv.isLinux [
61-
qtwayland
62-
];
51+
] ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ];
6352

6453
cmakeFlags = [
6554
(lib.cmakeBool "DEVIL" false)

pkgs/top-level/all-packages.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33076,7 +33076,9 @@ with pkgs;
3307633076

3307733077
phantomsocks = callPackage ../tools/networking/phantomsocks { };
3307833078

33079-
photoqt = qt6Packages.callPackage ../applications/graphics/photoqt { };
33079+
photoqt = callPackage ../by-name/ph/photoqt/package.nix {
33080+
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
33081+
};
3308033082

3308133083
photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
3308233084

0 commit comments

Comments
 (0)