public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llpp: 32 -> 33

Browse Source
This commit is contained in:
Markus S. Wamser 2020-10-14 07:16:08 +02:00 committed by Jonathan Ringer
parent 3c7e7b87b3
commit a08a95acd9
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz,
libGLU, libGL, freetype, xclip, inotify-tools, procps }: libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "llpp"; pname = "llpp";
version = "32"; version = "33";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/llpp.git"; url = "git://repo.or.cz/llpp.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y"; sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs";
fetchSubmodules = false; fetchSubmodules = false;
}; };
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
}); });
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ]; buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];
dontStrip = true; dontStrip = true;

28
pkgs/applications/misc/llpp/fix-build-bash.patch
View File

@ -1,8 +1,9 @@
diff --git a/build.bash b/build.bash diff --git a/build.bash b/build.bash
index 7c278b6..41494c5 100755 index 7c278b6..41494c5 100755
with manual adjustments
--- a/build.bash --- a/build.bash
+++ b/build.bash +++ b/build.bash
@@ -29,7 +29,6 @@ srcd="$(dirname $0)" @@ -30,7 +30,6 @@ srcd="$(dirname $0)"
mudir=$outd/mupdf mudir=$outd/mupdf
muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"
@ -10,25 +11,25 @@ index 7c278b6..41494c5 100755
mkdir -p $outd/{$wsid,lablGL} mkdir -p $outd/{$wsid,lablGL}
:>$outd/ordered :>$outd/ordered
@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } @@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
mbt=${mbt:-native} mulibst="$mudir/build/$mbt/libs"
mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a"
-keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs"
-isfresh "$mulibs" "$(eval $keycmd)" || ( -isfresh "$mulibst" "$(eval $keycmd)" || (
- make -C "$mudir" build=$mbt -j $mjobs libs - make -C "$mudir" build=$mbt -j $mjobs libs
- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past - eval $keycmd >${mulibst}.past
-) && vecho "fresh mupdf" -) && vecho "fresh mupdf"
- -
oincs() { oincs() {
local i= local i=
local incs1= local incs1=
@@ -89,34 +82,6 @@ mflags() { @@ -100,35 +93,6 @@ mflags() {
} }
overs="$(ocamlc -vnum 2>/dev/null)" || overs="" overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
-test "$overs" = "4.10.0" || { -test "$overs" = "4.11.1" || {
- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz - url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz
- txz=$outd/$(basename $url) - txz=$outd/$(basename $url)
- keycmd="printf $url; digest $txz;" - keycmd="printf $url; digest $txz;"
- isfresh $txz "$(eval $keycmd)" || { - isfresh $txz "$(eval $keycmd)" || {
@ -48,7 +49,8 @@ index 7c278b6..41494c5 100755
- tar xf $txz -C $outd - tar xf $txz -C $outd
- bn=$(basename $url) - bn=$(basename $url)
- cd $outd/${bn%.tar.xz} - cd $outd/${bn%.tar.xz}
- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix - ./configure --disable-ocamldoc --disable-ocamltest \
- --enable-debugger=no --prefix=$absprefix
- make -j $mjobs world - make -j $mjobs world
- make install - make install
- eval $keycmd >$absprefix/bin/ocamlc.past - eval $keycmd >$absprefix/bin/ocamlc.past
@ -58,7 +60,7 @@ index 7c278b6..41494c5 100755
ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \
{ read _ c; echo $c; })} { read _ c; echo $c; })}
@@ -230,7 +195,7 @@ bobjc() { @@ -243,7 +208,7 @@ bobjc() {
} && vecho "fresh $o" } && vecho "fresh $o"
} }
@ -67,12 +69,12 @@ index 7c278b6..41494c5 100755
cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do @@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do
done done
libs="str.cma unix.cma" libs="str.cma unix.cma"
-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" -clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"
+clibs="-lmupdf -lfreetype -lpthread" +clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz"
if $darwin; then if $darwin; then
mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
clibs="$clibs -framework Cocoa -framework OpenGL" clibs="$clibs -framework Cocoa -framework OpenGL"