Skip to content

Commit

Permalink
openboard: 1.7.1 -> 1.7.3 (#366878)
Browse files Browse the repository at this point in the history
  • Loading branch information
Scrumplex authored Dec 22, 2024
2 parents 5e7d59c + b1660dd commit c620be1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 deletions.
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2155,6 +2155,11 @@
github = "AtilaSaraiva";
githubId = 29521461;
};
atinba = {
name = "Atin Bainada";
github = "atinba";
githubId = 61903527;
};
atkinschang = {
email = "[email protected]";
github = "AtkinsChang";
Expand Down
27 changes: 7 additions & 20 deletions pkgs/applications/graphics/openboard/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch2,
copyDesktopItems,
makeDesktopItem,
qmake,
Expand Down Expand Up @@ -56,31 +55,15 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openboard";
version = "1.7.1";
version = "1.7.3";

src = fetchFromGitHub {
owner = "OpenBoard-org";
repo = "OpenBoard";
rev = "v${finalAttrs.version}";
hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM=";
hash = "sha256-Igp5WSVQ9FrzS2AhDDPwVBo76SaFw9xP6lqgW7S/KIE=";
};

patches = [
# fix: Support FFmpeg 7.0
# https://github.com/OpenBoard-org/OpenBoard/pull/1017
(fetchpatch2 {
url = "https://github.com/OpenBoard-org/OpenBoard/commit/4f45b6c4016972cf5835f9188bda6197b1b4ed2f.patch?full_index=1";
hash = "sha256-MUJbHfOCMlRO4pg5scm+DrBsngZwB7UPuDJZss5x9Zs=";
})

# fix: Resolve FFmpeg 7.0 warnings
# https://github.com/OpenBoard-org/OpenBoard/pull/1017
(fetchpatch2 {
url = "https://github.com/OpenBoard-org/OpenBoard/commit/315bcac782e10cc6ceef1fc8b78fff40541ea38f.patch?full_index=1";
hash = "sha256-736eX+uXuZwHJxOXAgxs2/vjjD1JY9mMyj3rR45/7xk=";
})
];

postPatch = ''
substituteInPlace OpenBoard.pro \
--replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
Expand Down Expand Up @@ -167,8 +150,12 @@ stdenv.mkDerivation (finalAttrs: {

meta = with lib; {
description = "Interactive whiteboard application";
homepage = "https://openboard.ch/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fufexan ];
maintainers = with maintainers; [
atinba
fufexan
];
platforms = platforms.linux;
mainProgram = "OpenBoard";
};
Expand Down

0 comments on commit c620be1

Please sign in to comment.