From d798b7fcb3ae1d37ebd1f836baac1a7b60e95002 Mon Sep 17 00:00:00 2001 From: Valentin Bruch Date: Sat, 9 Sep 2023 00:26:27 +0200 Subject: [PATCH 1/2] beamerpresenter: 0.2.3 -> 0.2.4 this should fix building with MuPDF 1.23 --- .../office/beamerpresenter/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 41607522f73c..562544a1789a 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}"; + sha256 = "1zypzmkiwc14b9224nr37y7wviasirmwhfmifb7q1b33877g41ji"; }; 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}" ]; From b6fe1254b211881a725415b55f57cc99b45c90e9 Mon Sep 17 00:00:00 2001 From: Valentin Bruch Date: Sat, 9 Sep 2023 08:55:38 +0200 Subject: [PATCH 2/2] beamerpresenter: change sha256=... to hash="sha256..." --- pkgs/applications/office/beamerpresenter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 562544a1789a..91fea99ff1e5 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - sha256 = "1zypzmkiwc14b9224nr37y7wviasirmwhfmifb7q1b33877g41ji"; + hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8="; }; nativeBuildInputs = [