diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-10 00:02:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 00:02:18 +0000 |
| commit | b5ff56aec743b9c83609fc0e26a6c439ee27f0df (patch) | |
| tree | f685ccec1c75baf307f966b6692324a727ce9e17 /pkgs/applications/graphics | |
| parent | 7c846b760dc09e6bf57b1f7c89f099c53f7a34c8 (diff) | |
| parent | 84536849e642d11780b35db7862b23cf4423aff0 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/openboard/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 3178c50c933de..e32e668573132 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake +{ stdenv, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let - importer = stdenv.mkDerivation rec { + importer = stdenv.mkDerivation { pname = "openboard-importer"; version = "unstable-2016-10-08"; @@ -23,15 +23,15 @@ let install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter ''; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "unstable-2022-11-28"; + version = "1.7.0"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; - rev = "9de37af2df1a7c0d88f71c94ab2db1815d082862"; - sha256 = "sha256-TiKrSyxtF1g1bepCoFxoxGOdREXhsMrS3g8uZKSiugg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; }; postPatch = '' @@ -115,4 +115,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; }; -} +}) |