From acb5b93f265fc704b39e28c95552dd01c07135df Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Sat, 3 Jun 2023 17:56:44 +0200 Subject: [PATCH] pdftoipe: fix build by applying patch from PR 55 as well --- pkgs/tools/graphics/pdftoipe/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/tools/graphics/pdftoipe/default.nix index 763a1366801e..fc4e0d964fdc 100644 --- a/pkgs/tools/graphics/pdftoipe/default.nix +++ b/pkgs/tools/graphics/pdftoipe/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "otfried"; repo = "ipe-tools"; rev = "v${version}"; - sha256 = "jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k="; + hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k="; }; patches = [ @@ -22,9 +22,16 @@ stdenv.mkDerivation rec { # https://github.com/otfried/ipe-tools/pull/48 (fetchpatch { url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch"; - sha256 = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc="; + hash = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc="; stripLen = 1; - name = "poppler_fix_build.patch"; + name = "poppler_fix_build_48.patch"; + }) + # https://github.com/otfried/ipe-tools/pull/55 + (fetchpatch { + url = "https://github.com/otfried/ipe-tools/commit/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4.patch"; + hash = "sha256-qr1AQyWHz1e2a65m05xSHFnP6oSP6qSmMVekNk2flRc="; + stripLen = 1; + name = "poppler_fix_build_55.patch"; }) ]; @@ -40,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that tries to convert arbitrary PDF documents to Ipe files"; homepage = "https://github.com/otfried/ipe-tools"; + changelog = "https://github.com/otfried/ipe-tools/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ yrd ]; };