From 2bbf89b92c5097d72c3c2fdae249a26da4f263ab Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 17 Apr 2024 21:40:25 +0200 Subject: [PATCH 1/2] pdfpc: allow compiling with markdown3 markdown3 was introduced recently in #289126. Fixes #304729 --- pkgs/applications/misc/pdfpc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 9e36bba66961..b80f7af41a0c 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { 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.isDarwin "-DMOVIES=OFF"; From 27865166ef3e25db853a67ca98d3e4ef06981dc5 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 17 Apr 2024 22:26:39 +0200 Subject: [PATCH 2/2] pdfpc: convert to using lib.cmakeBool Co-authored-by: Anderson Torres --- pkgs/applications/misc/pdfpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index b80f7af41a0c..7d46836b796e 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = lib.optional stdenv.isDarwin "-DMOVIES=OFF"; + cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { description = "A presenter console with multi-monitor support for PDF files";