From 86471c0cdef020b8fb57dad2e2883e6eee79818c Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 12 Apr 2025 08:43:25 +0200 Subject: [PATCH 1/2] pdfpc: 4.6.0 -> 4.7.0 Diff: https://github.com/pdfpc/pdfpc/compare/v4.6.0...v4.7.0 Since https://github.com/pdfpc/pdfpc/pull/728, libsoup3 (and thus webkitgtk_4_1) is supported. The two previously applied patches are included in the release, see: https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714 https://github.com/pdfpc/pdfpc/pull/716/commits/29a5d226f62ae081de5ee779baef827b51e3841c --- pkgs/applications/misc/pdfpc/default.nix | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 661117bcaace..8defab142758 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -16,7 +16,7 @@ gobject-introspection, wrapGAppsHook3, qrencode, - webkitgtk_4_0, + webkitgtk_4_1, discount, json-glib, fetchpatch, @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "pdfpc"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - hash = "sha256-5HFmbVsNajMwo+lBe9kJcJyQGe61N6Oy2CI/WJwmSE4="; + hash = "sha256-fPhCrn1ELC03/II+e021BUNJr1OKCBIcFCM7z+2Oo+s="; }; nativeBuildInputs = [ @@ -52,27 +52,11 @@ stdenv.mkDerivation rec { (gst-plugins-good.override { gtkSupport = true; }) gst-libav qrencode - webkitgtk_4_0 + webkitgtk_4_1 discount json-glib ]; - patches = [ - # needed for compiling pdfpc 4.6.0 with vala 0.56.7, see - # https://github.com/pdfpc/pdfpc/issues/686 - # https://github.com/pdfpc/pdfpc/pull/687 - (fetchpatch { - url = "https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714.diff"; - hash = "sha256-KC2oyzcwU2fUmxaed8qAsKcePwR5KcXgpVdstJg8KmU="; - }) - # Allow compiling with markdown3 - # https://github.com/pdfpc/pdfpc/pull/716 - (fetchpatch { - url = "https://github.com/pdfpc/pdfpc/commit/08e66b9d432e9598c1ee9a78b2355728036ae1a1.patch"; - hash = "sha256-SKH2GQ5/6Is36xOFmSs89Yw/w7Fnma3FrNqwjOlUQKM="; - }) - ]; - cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { From 911cb8b7a735f5cef1c47a316cf7f5c3488e51e3 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 12 Apr 2025 08:50:31 +0200 Subject: [PATCH 2/2] pdfpc: add update script --- pkgs/applications/misc/pdfpc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 8defab142758..67c6052585ce 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -19,7 +19,7 @@ webkitgtk_4_1, discount, json-glib, - fetchpatch, + nix-update-script, }: stdenv.mkDerivation rec { @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false); + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Presenter console with multi-monitor support for PDF files"; mainProgram = "pdfpc";