diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-02-03 22:12:23 +0100 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-02-03 22:12:53 +0100 |
commit | c1604543bfa301584d4f028dda184f13c4cf9607 (patch) | |
tree | da1a66a680b2b72b326b8304e214b1443e419561 /pkgs/applications/misc/llpp/default.nix | |
parent | 7a6aac90763e1c92fea53154c876e05a28067235 (diff) | |
download | nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.tar nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.tar.gz nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.tar.bz2 nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.tar.lz nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.tar.xz nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.tar.zst nixlib-c1604543bfa301584d4f028dda184f13c4cf9607.zip |
llpp: 2016-05-07 -> 2017-01-18
Diffstat (limited to 'pkgs/applications/misc/llpp/default.nix')
-rw-r--r-- | pkgs/applications/misc/llpp/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e350a9a95301..ee06ea1ad6cf 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf +, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2016-05-07"; + version = "25-git-2017-01-18"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4"; - sha256 = "1r59yfm81zmiij401d3wc3zb1zc873ss02gkplbwi4lad2l0chba"; + rev = "22740b9bca1c60ef18cf90538994ce4981539901"; + sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4"; fetchSubmodules = false; }; - buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl - gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ]; + nativeBuildInputs = [ pkgconfig makeWrapper ninja ]; + buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl + openjpeg mujs openssl freetype ncurses ]; dontStrip = true; configurePhase = '' + sed -i -e 's+fz_set_use_document_css (state.ctx, usedoccss);+/* fz_set_use_document_css (state.ctx, usedoccss); */+' link.c + sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh @@ -29,12 +32,12 @@ in stdenv.mkDerivation rec { buildPhase = '' sh ./build.sh build ''; +# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ installPhase = '' install -d $out/bin $out/lib install build/llpp $out/bin wrapProgram $out/bin/llpp \ - --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "${xsel}/bin" ''; |