llpp: 32 -> 33

authored by

Markus S. Wamser and committed by
Jonathan Ringer
a08a95ac 3c7e7b87

+20 -18
+5 -5
pkgs/applications/misc/llpp/default.nix
··· 1 - { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, 2 - libGLU, libGL, freetype, xclip, inotify-tools, procps }: 1 + { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, 2 + libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: 3 3 4 4 assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "llpp"; 8 - version = "32"; 8 + version = "33"; 9 9 10 10 src = fetchgit { 11 11 url = "git://repo.or.cz/llpp.git"; 12 12 rev = "v${version}"; 13 - sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y"; 13 + sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs"; 14 14 fetchSubmodules = false; 15 15 }; 16 16 ··· 20 20 }); 21 21 22 22 nativeBuildInputs = [ makeWrapper ]; 23 - buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ]; 23 + buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; 24 24 25 25 dontStrip = true; 26 26
+15 -13
pkgs/applications/misc/llpp/fix-build-bash.patch
··· 1 1 diff --git a/build.bash b/build.bash 2 2 index 7c278b6..41494c5 100755 3 + with manual adjustments 3 4 --- a/build.bash 4 5 +++ b/build.bash 5 - @@ -29,7 +29,6 @@ srcd="$(dirname $0)" 6 + @@ -30,7 +30,6 @@ srcd="$(dirname $0)" 6 7 mudir=$outd/mupdf 7 8 muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" 8 9 ··· 10 11 11 12 mkdir -p $outd/{$wsid,lablGL} 12 13 :>$outd/ordered 13 - @@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } 14 - mbt=${mbt:-native} 15 - mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a 14 + @@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } 15 + mulibst="$mudir/build/$mbt/libs" 16 + mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a" 16 17 17 18 -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" 18 - -isfresh "$mulibs" "$(eval $keycmd)" || ( 19 + -isfresh "$mulibst" "$(eval $keycmd)" || ( 19 20 - make -C "$mudir" build=$mbt -j $mjobs libs 20 - - eval $keycmd >$mudir/build/$mbt/libmupdf.a.past 21 + - eval $keycmd >${mulibst}.past 21 22 -) && vecho "fresh mupdf" 22 23 - 23 24 oincs() { 24 25 local i= 25 26 local incs1= 26 - @@ -89,34 +82,6 @@ mflags() { 27 + @@ -100,35 +93,6 @@ mflags() { 27 28 } 28 29 29 30 overs="$(ocamlc -vnum 2>/dev/null)" || overs="" 30 - -test "$overs" = "4.10.0" || { 31 - - url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz 31 + -test "$overs" = "4.11.1" || { 32 + - url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz 32 33 - txz=$outd/$(basename $url) 33 34 - keycmd="printf $url; digest $txz;" 34 35 - isfresh $txz "$(eval $keycmd)" || { ··· 48 49 - tar xf $txz -C $outd 49 50 - bn=$(basename $url) 50 51 - cd $outd/${bn%.tar.xz} 51 - - ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix 52 + - ./configure --disable-ocamldoc --disable-ocamltest \ 53 + - --enable-debugger=no --prefix=$absprefix 52 54 - make -j $mjobs world 53 55 - make install 54 56 - eval $keycmd >$absprefix/bin/ocamlc.past ··· 58 60 59 61 ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ 60 62 { read _ c; echo $c; })} 61 - @@ -230,7 +195,7 @@ bobjc() { 63 + @@ -243,7 +208,7 @@ bobjc() { 62 64 } && vecho "fresh $o" 63 65 } 64 66 ··· 67 69 68 70 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" 69 71 keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" 70 - @@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do 72 + @@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do 71 73 done 72 74 73 75 libs="str.cma unix.cma" 74 76 -clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" 75 - +clibs="-lmupdf -lfreetype -lpthread" 77 + +clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz" 76 78 if $darwin; then 77 79 mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) 78 80 clibs="$clibs -framework Cocoa -framework OpenGL"