From 2dc42b1eeceb9613ac9faed01b325c8ca12c04f5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 4 Aug 2015 12:59:34 +0200 Subject: [PATCH] llpp: update to 2015-07-30, fix build and don't fetch submodules --- pkgs/applications/misc/llpp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index bd0727ccab11..9d9b69f59588 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,19 +1,20 @@ { 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; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2015-06-27"; + version = "21-git-2015-07-30"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "843c42ef41bb78a3b1ee995fc2bab91f8796e8ad"; - sha256 = "0h8wa7f5bj5sm3sr8namcyy81s4s80hyasimyfw935lqyw2q2k60"; + rev = "e9fe06d684b145a104cc319673076e069e853cac"; + sha256 = "0x3hgn6sfjln2sqdw40ylcj943rn732a6mlfwz01llx8ykiyvsvq"; + fetchSubmodules = false; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl - gtk3 jbig2dec openjpeg mujs ]; + gtk3 jbig2dec openjpeg mujs openssl ]; configurePhase = '' sh configure.sh -O -F ${mupdf}