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

llpp: 25-git-2017-01-08 -> 26b

Browse Source
This commit is contained in:
Pascal Wittmann 2017-11-10 21:33:53 +01:00
parent 0e92951773
commit 430a6ff7a5
No known key found for this signature in database
GPG Key ID: C899ACE7E2322852
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,18 +6,17 @@ 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 = "25-git-2017-01-18"; version = "26b";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/llpp.git"; url = "git://repo.or.cz/llpp.git";
rev = "22740b9bca1c60ef18cf90538994ce4981539901"; rev = "v${version}";
sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4"; sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj";
fetchSubmodules = false; fetchSubmodules = false;
}; };
nativeBuildInputs = [ pkgconfig makeWrapper ninja ]; nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
openjpeg mujs openssl freetype ncurses ];
dontStrip = true; dontStrip = true;
@ -32,7 +31,6 @@ 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