diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-06 22:48:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 22:48:30 +0200 |
| commit | c3b1c68d62c2726c2b1d7c0839b1846fa2142535 (patch) | |
| tree | ce56e7d9b6ea88cfeae760ef75ebd11184d9f69e | |
| parent | b25c0d045b23cf2c8eba519d9f22ba5d4257fce8 (diff) | |
| parent | a4384ecfb23b72e8e37103df64aee9bcae0d53ef (diff) | |
Merge pull request #219867 from wegank/llpp-bump
llpp: 33 -> 41
| -rw-r--r-- | pkgs/applications/misc/llpp/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 443a03c2ad22..427be6031585 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,27 +1,34 @@ -{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, +{ stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "33"; + version = "41"; - src = fetchgit { - url = "git://repo.or.cz/llpp.git"; + src = fetchFromGitHub { + owner = "criticic"; + repo = pname; rev = "v${version}"; - sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs"; - fetchSubmodules = false; + hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE="; }; - patches = (substituteAll { - inherit version; - src = ./fix-build-bash.patch; - }); + 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="; + }) + ]; + + postPatch = '' + sed -i "2d;s/ver=.*/ver=${version}/" build.bash + ''; strictDeps = true; - nativeBuildInputs = [ makeWrapper ocaml ]; + nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; @@ -53,9 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; - # Project is unmaintained and fails to build: - # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int') - broken = true; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c5ae6d6ac59..3f2ef63b7bb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31296,7 +31296,7 @@ with pkgs; linuxsampler = callPackage ../applications/audio/linuxsampler { }; llpp = callPackage ../applications/misc/llpp { - inherit (ocaml-ng.ocamlPackages_4_09) ocaml; + inherit (ocaml-ng.ocamlPackages_4_14) ocaml; }; lls = callPackage ../applications/networking/lls { }; |