diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/llpp')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/llpp/default.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/llpp/fix-mupdf.patch | 13 |
2 files changed, 3 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/applications/misc/llpp/default.nix b/nixpkgs/pkgs/applications/misc/llpp/default.nix index ba004e343844..38da8824cb0d 100644 --- a/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -16,11 +16,10 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "system-makedeps.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c"; - hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo="; + name = "system-makedeps-and-ocaml5.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps-and-ocaml5.patch?h=llpp&id=32955e115f914bb96348d288f9af9c6e3e80a02b"; + hash = "sha256-3rcPsR+M8Jx7M8GHUIsw0WNBvp6aE7BcPr4yk2vT9Ik="; }) - ./fix-mupdf.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/llpp/fix-mupdf.patch b/nixpkgs/pkgs/applications/misc/llpp/fix-mupdf.patch deleted file mode 100644 index 1a3c2516fc11..000000000000 --- a/nixpkgs/pkgs/applications/misc/llpp/fix-mupdf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/link.c -+++ b/link.c -@@ -1522,8 +1522,9 @@ static void *mainloop (void UNUSED_ATTR *unused) - if (pdf && nameddest && *nameddest) { - fz_point xy; - struct pagedim *pdim; -- int pageno = pdf_lookup_anchor (state.ctx, pdf, nameddest, -+ fz_location location = fz_resolve_link (state.ctx, state.doc, nameddest, - &xy.x, &xy.y); -+ int pageno = location.page; - pdim = pdimofpageno (pageno); - xy = fz_transform_point (xy, pdim->ctm); - printd ("a %d %d %d", pageno, (int) xy.x, (int) xy.y); |