From 1717df9134474b3773c9653914e318b99a407d13 Mon Sep 17 00:00:00 2001 From: Valentin Bruch Date: Tue, 6 Sep 2022 01:16:24 +0200 Subject: [PATCH 1/2] beamerpresenter: 0.2.2 -> 0.2.3 Version 0.2.2 fails to build. This should be fixed in 0.2.3. For more changes see CHANGELOG.md on https://github.com/stiglers-eponym/BeamerPresenter --- pkgs/applications/office/beamerpresenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index c716323d4fcc..ec09f952de49 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - sha256 = "16v263nnnipih3lxg95rmwz0ihnvpl4n1wlj9r6zavnspzlp9dvb"; + sha256 = "1n9d0i0j67ymnghn8zkqf52c88zby6rqin8aicbw8cpn35fqf5a6"; }; nativeBuildInputs = [ From 9a067292d3b97257c72abdd9c4d89591ec0686d2 Mon Sep 17 00:00:00 2001 From: Valentin Bruch Date: Tue, 6 Sep 2022 01:28:49 +0200 Subject: [PATCH 2/2] beamerpresenter: set compile time options explicitly Compile time options are set explicitly for clarity. Option USE_EXTERNAL_RENDERER can now be set using useExternalRenderer variable. Option USE_QTPDF is disabled because it is only intended as a backup if MuPDF and Poppler are both not available. --- pkgs/applications/office/beamerpresenter/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index ec09f952de49..2e4959ce0a52 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -22,6 +22,7 @@ # choose renderer: mupdf or poppler or both (not recommended) , usePoppler ? false , useMupdf ? true +, useExternalRenderer ? false }: stdenv.mkDerivation rec { @@ -67,6 +68,9 @@ stdenv.mkDerivation rec { "-DGIT_VERSION=OFF" "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" + "-DUSE_QTPDF=OFF" + "-DUSE_MUPDF_THIRD=ON" + "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" "-DUSE_MUJS=OFF" "-DUSE_GUMBO=ON" "-DUSE_TRANSLATIONS=ON"