From 83df2f2a9f52732581a5a0e840c5fea17e54fb7f Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 22 Sep 2022 01:01:46 +0200 Subject: [PATCH] pdfmixtool: 1.0.2 -> 1.1 - add patch to fix build with newer qpdf version tracked upstream https://gitlab.com/scarpetta/pdfmixtool/-/issues/81 Signed-off-by: Florian Brandes --- pkgs/applications/office/pdfmixtool/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix index 7d874015dc24..c8f6ce6de10f 100644 --- a/pkgs/applications/office/pdfmixtool/default.nix +++ b/pkgs/applications/office/pdfmixtool/default.nix @@ -1,23 +1,25 @@ { lib , mkDerivation , fetchFromGitLab +, fetchpatch , cmake , pkg-config , qtbase , qttools , qpdf , podofo +, imagemagick }: mkDerivation rec { pname = "pdfmixtool"; - version = "1.0.2"; + version = "1.1"; src = fetchFromGitLab { owner = "scarpetta"; repo = pname; rev = "v${version}"; - sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467"; + hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc="; }; nativeBuildInputs = [ @@ -26,12 +28,22 @@ mkDerivation rec { ]; buildInputs = [ + imagemagick qtbase qttools qpdf podofo ]; + patches = [ + # fix incompatibility with qpdf11 + (fetchpatch { + url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff"; + hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g="; + }) + + ]; + meta = with lib; { description = "An application to split, merge, rotate and mix PDF files"; homepage = "https://gitlab.com/scarpetta/pdfmixtool";