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

llpp: 2016-05-07 -> 2017-01-18

Browse Source
This commit is contained in:
Pascal Wittmann 2017-02-03 22:12:23 +01:00
parent 7a6aac9076
commit c1604543bf
No known key found for this signature in database
GPG Key ID: C899ACE7E2322852
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,29 @@
{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl { stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf
, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: , lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "llpp-${version}"; name = "llpp-${version}";
version = "21-git-2016-05-07"; version = "25-git-2017-01-18";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/llpp.git"; url = "git://repo.or.cz/llpp.git";
rev = "1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4"; rev = "22740b9bca1c60ef18cf90538994ce4981539901";
sha256 = "1r59yfm81zmiij401d3wc3zb1zc873ss02gkplbwi4lad2l0chba"; sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4";
fetchSubmodules = false; fetchSubmodules = false;
}; };
buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ]; buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl
openjpeg mujs openssl freetype ncurses ];
dontStrip = true; dontStrip = true;
configurePhase = '' 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+-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+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
@ -29,12 +32,12 @@ in stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
sh ./build.sh build sh ./build.sh build
''; '';
# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
installPhase = '' installPhase = ''
install -d $out/bin $out/lib install -d $out/bin $out/lib
install build/llpp $out/bin install build/llpp $out/bin
wrapProgram $out/bin/llpp \ wrapProgram $out/bin/llpp \
--prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
--prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \
--prefix PATH ":" "${xsel}/bin" --prefix PATH ":" "${xsel}/bin"
''; '';

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

@ -14018,7 +14018,7 @@ with pkgs;
bison = bison2; bison = bison2;
}; };
inherit (ocaml-ng.ocamlPackages_4_02) llpp; inherit (ocaml-ng.ocamlPackages_4_04) llpp;
lmms = callPackage ../applications/audio/lmms { }; lmms = callPackage ../applications/audio/lmms { };