nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219867 from wegank/llpp-bump

Browse Source 
llpp: 33 -> 41
This commit is contained in:
Weijia Wang 2023-03-06 22:48:30 +02:00 committed by GitHub
commit c3b1c68d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/misc/llpp/default.nix
View File

@ -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;
};

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };