diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-10 00:02:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-10 00:02:16 +0000 |
| commit | b6eb350562737bdcf962bd3fc643da7f84f4cca7 (patch) | |
| tree | a58960e9b8169663b6cdfd88956ee9d188d85495 /pkgs/applications/office | |
| parent | 66c722f52f05f82da2fb57f81fd748b9c0ff5f58 (diff) | |
| parent | 2b1eb11946cd47f4d7a5e248a091852b0fbb5fda (diff) | |
| download | nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.tar nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.tar.gz nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.tar.bz2 nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.tar.lz nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.tar.xz nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.tar.zst nixpkgs-b6eb350562737bdcf962bd3fc643da7f84f4cca7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/beamerpresenter/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 41607522f73..91fea99ff1e 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -7,6 +7,7 @@ , wrapQtAppsHook , gst_all_1 , qtbase +, qtsvg , qtmultimedia , qttools , qtwayland @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.3-1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; - rev = "dd41a00b3c6c8b881fa62945165c965634df66f0"; - sha256 = "11yj1zl8hdnqbynkbyzg8kwyx1jl8c87x8f8qyllpk0s6cg304d0"; + rev = "v${version}"; + hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8="; }; nativeBuildInputs = [ @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good zlib qtbase + qtsvg qtmultimedia qttools ] ++ lib.optionals stdenv.isLinux [ @@ -70,10 +72,10 @@ stdenv.mkDerivation rec { "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_QTPDF=OFF" - "-DUSE_MUPDF_THIRD=ON" + "-DLINK_MUPDF_THIRD=ON" "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" - "-DUSE_MUJS=OFF" - "-DUSE_GUMBO=ON" + "-DLINK_MUJS=OFF" + "-DLINK_GUMBO=ON" "-DUSE_TRANSLATIONS=ON" "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}" ]; |