pyrox.dev
merkaartor: update to qt6
+8
-7
pkgs/by-name/me/merkaartor/package.nix
+8
-7
pkgs/by-name/me/merkaartor/package.nix
···
7
7
gdal,
8
8
proj,
9
9
protobuf,
10
-
qt5,
10
+
qt6,
11
11
withGeoimage ? true,
12
12
exiv2,
13
13
withGpsdlib ? (!stdenv.hostPlatform.isDarwin),
···
25
25
src = fetchFromGitHub {
26
26
owner = "openstreetmap";
27
27
repo = "merkaartor";
28
-
rev = version;
28
+
tag = version;
29
29
hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";
30
30
};
31
31
32
32
nativeBuildInputs = [
33
33
cmake
34
34
pkg-config
35
-
qt5.qttools
36
-
qt5.wrapQtAppsHook
35
+
qt6.qttools
36
+
qt6.wrapQtAppsHook
37
37
];
38
38
39
39
buildInputs = [
40
40
gdal
41
41
proj
42
42
protobuf
43
-
qt5.qtnetworkauth
44
-
qt5.qtsvg
45
-
qt5.qtwebengine
43
+
qt6.qt5compat
44
+
qt6.qtnetworkauth
45
+
qt6.qtsvg
46
+
qt6.qtwebengine
46
47
]
47
48
++ lib.optional withGeoimage exiv2
48
49
++ lib.optional withGpsdlib gpsd