llpp: update to 2015-07-30, fix build and don't fetch submodules
This commit is contained in:
parent
6b2c6bea0a
commit
2dc42b1eec
@ -1,19 +1,20 @@
|
|||||||
{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
|
{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
|
||||||
, gtk3, openjpeg, jbig2dec, mujs, xsel }:
|
, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl }:
|
||||||
|
|
||||||
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-2015-06-27";
|
version = "21-git-2015-07-30";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "git://repo.or.cz/llpp.git";
|
url = "git://repo.or.cz/llpp.git";
|
||||||
rev = "843c42ef41bb78a3b1ee995fc2bab91f8796e8ad";
|
rev = "e9fe06d684b145a104cc319673076e069e853cac";
|
||||||
sha256 = "0h8wa7f5bj5sm3sr8namcyy81s4s80hyasimyfw935lqyw2q2k60";
|
sha256 = "0x3hgn6sfjln2sqdw40ylcj943rn732a6mlfwz01llx8ykiyvsvq";
|
||||||
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl
|
buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl
|
||||||
gtk3 jbig2dec openjpeg mujs ];
|
gtk3 jbig2dec openjpeg mujs openssl ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
sh configure.sh -O -F ${mupdf}
|
sh configure.sh -O -F ${mupdf}
|
||||||
|
Loading…
Reference in New Issue
Block a user