Skip to content

Commit 5218f86

Browse files
committed
openboard: switch to qt6 and remove obsolete importer
1 parent b2c8bfb commit 5218f86

File tree

1 file changed

+16
-31
lines changed

1 file changed

+16
-31
lines changed

pkgs/by-name/op/openboard/package.nix

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fetchFromGitHub,
55
cmake,
66
pkg-config,
7-
libsForQt5,
7+
qt6Packages,
88
libGL,
99
fontconfig,
1010
openssl,
@@ -27,28 +27,15 @@
2727
}:
2828

2929
let
30-
importer = stdenv.mkDerivation {
31-
pname = "openboard-importer";
32-
version = "0-unstable-2016-10-08";
33-
34-
src = fetchFromGitHub {
35-
owner = "OpenBoard-org";
36-
repo = "OpenBoard-Importer";
37-
rev = "47927bda021b4f7f1540b794825fb0d601875e79";
38-
sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf";
39-
};
40-
41-
nativeBuildInputs = [
42-
libsForQt5.qmake
43-
libsForQt5.wrapQtAppsHook
44-
];
45-
buildInputs = [ libsForQt5.qtbase ];
46-
dontWrapQtApps = true;
47-
48-
installPhase = ''
49-
install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter
50-
'';
51-
};
30+
inherit (qt6Packages)
31+
qtbase
32+
qttools
33+
qtmultimedia
34+
qtwebengine
35+
qmake
36+
wrapQtAppsHook
37+
quazip
38+
;
5239
in
5340
stdenv.mkDerivation (finalAttrs: {
5441
pname = "openboard";
@@ -76,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
7663
nativeBuildInputs = [
7764
cmake
7865
pkg-config
79-
libsForQt5.wrapQtAppsHook
66+
wrapQtAppsHook
8067
];
8168

8269
buildInputs = [
83-
libsForQt5.qtbase
84-
libsForQt5.qtxmlpatterns
85-
libsForQt5.qttools
86-
libsForQt5.qtwebengine
70+
qtbase
71+
qttools
72+
qtwebengine
73+
qtmultimedia
8774
libGL
8875
fontconfig
8976
openssl
@@ -101,13 +88,11 @@ stdenv.mkDerivation (finalAttrs: {
10188
lame
10289
fdk_aac
10390
libass
104-
libsForQt5.quazip
91+
quazip
10592
libXext
10693
libXfixes
10794
];
10895

109-
propagatedBuildInputs = [ importer ];
110-
11196
meta = with lib; {
11297
description = "Interactive whiteboard application";
11398
homepage = "https://openboard.ch/";

0 commit comments

Comments
 (0)