pyrox.dev
Merge pull request #292845 from wegank/photoqt-bump
photoqt: 4.2 -> 4.3
authored by Weijia Wang and committed by GitHub f8e20325 7858badc
+9
-9
pkgs/applications/graphics/photoqt/default.nix
+9
-9
pkgs/applications/graphics/photoqt/default.nix
···
20
20
, qtmultimedia
21
21
, qtpositioning
22
22
, qtsvg
23
+
, zxing-cpp
23
24
, qtwayland
24
25
}:
25
26
26
27
stdenv.mkDerivation rec {
27
28
pname = "photoqt";
28
-
version = "4.2";
29
+
version = "4.3";
29
30
30
31
src = fetchurl {
31
32
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
32
-
hash = "sha256-OUqsyvmv6ccJDzcWAeS1OOmK2eXOCEgGktz6GEUzoA8=";
33
+
hash = "sha256-B0ZubvWIEZFnD2v74bpPv+/wr7vaHS9QP4//9/afjzQ=";
33
34
};
34
35
35
36
nativeBuildInputs = [
···
55
56
qtmultimedia
56
57
qtpositioning
57
58
qtsvg
59
+
zxing-cpp
58
60
] ++ lib.optionals stdenv.isLinux [
59
61
qtwayland
60
62
];
61
63
62
64
cmakeFlags = [
63
-
"-DDEVIL=OFF"
64
-
"-DCHROMECAST=OFF"
65
-
"-DFREEIMAGE=OFF"
66
-
"-DIMAGEMAGICK=OFF"
65
+
(lib.cmakeBool "DEVIL" false)
66
+
(lib.cmakeBool "CHROMECAST" false)
67
+
(lib.cmakeBool "FREEIMAGE" false)
68
+
(lib.cmakeBool "IMAGEMAGICK" false)
67
69
];
68
70
69
-
preConfigure = ''
70
-
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
71
-
'';
71
+
env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick";
72
72
73
73
postInstall = lib.optionalString stdenv.isDarwin ''
74
74
mkdir -p $out/Applications