diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-11-10 21:33:53 +0100 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-11-10 21:34:21 +0100 |
| commit | 430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8 (patch) | |
| tree | 0e5d3197c546020240ae0218b30e2a1a53773f28 /pkgs/applications | |
| parent | 0e92951773200dbcfd45c04011524c417c55cdf2 (diff) | |
| download | nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.tar nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.tar.gz nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.tar.bz2 nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.tar.lz nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.tar.xz nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.tar.zst nixpkgs-430a6ff7a5d2a496e50882acb2b7f4ad4fc1e3d8.zip | |
llpp: 25-git-2017-01-08 -> 26b
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/llpp/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ee06ea1ad6c..837a221be94 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -6,18 +6,17 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "25-git-2017-01-18"; + version = "26b"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "22740b9bca1c60ef18cf90538994ce4981539901"; - sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4"; + rev = "v${version}"; + sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj"; fetchSubmodules = false; }; nativeBuildInputs = [ pkgconfig makeWrapper ninja ]; - buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl - openjpeg mujs openssl freetype ncurses ]; + buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ]; dontStrip = true; @@ -32,7 +31,6 @@ 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 |