lol

Added llpp, a mupdf based pdf pager written in ocaml. Updated lablgl to 1.05 and mupdf to 1.4. Added myself as maintainer for lablgl.

+84 -65
+75
pkgs/applications/misc/llpp/default.nix
··· 1 + { stdenv, fetchgit, ocaml, mupdf, lablgl, mesa 2 + , libX11, libXext, gtk3, freetype, zlib, openjpeg 3 + , jbig2dec, libjpeg, ncurses }: 4 + 5 + stdenv.mkDerivation { 6 + name = "llpp-2014-05-26"; 7 + 8 + src = fetchgit { 9 + url = "git://repo.or.cz/llpp.git"; 10 + rev = "902143de64d86b5714b3a59d2cc7085083b87249"; 11 + sha256 = "038xl4gbvm57na2lz1fw36sf43zaxq407zi2d53985vc33677j9s"; 12 + }; 13 + 14 + buildInputs = [ ocaml mupdf lablgl mesa libX11 libXext gtk3 15 + freetype jbig2dec libjpeg openjpeg zlib ncurses ]; 16 + 17 + # The build phase was extracted from buildall.sh, because that script 18 + # fetched the dependencies on its own. 19 + buildPhase = '' 20 + ccopt="-O" 21 + ccopt="$ccopt -I ${jbig2dec}/include" 22 + ccopt="$ccopt -I ${libjpeg}/include" 23 + ccopt="$ccopt -I ${freetype}/include" 24 + ccopt="$ccopt -I ${openjpeg}/include" 25 + ccopt="$ccopt -I ${zlib}/include" 26 + ccopt="$ccopt -I ${mupdf}/include" 27 + ccopt="$ccopt -include ${freetype}/include/ft2build.h" 28 + ccopt="$ccopt -D_GNU_SOURCE" 29 + 30 + cclib="$cclib -lmupdf" 31 + cclib="$cclib -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lpthread" 32 + cclib="$cclib -lX11" 33 + cclib="$cclib -lfreetype" 34 + 35 + comp=ocamlc.opt 36 + cmsuf=cmo 37 + 38 + sh mkhelp.sh keystoml.ml KEYS > help.ml 39 + 40 + $comp -c -o link.o -ccopt "$ccopt" link.c 41 + $comp -c -o help.$cmsuf help.ml 42 + $comp -c -o utils.$cmsuf utils.ml 43 + $comp -c -o wsi.cmi wsi.mli 44 + $comp -c -o wsi.$cmsuf wsi.ml 45 + $comp -c -o parser.$cmsuf parser.ml 46 + $comp -c -o main.$cmsuf -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl main.ml 47 + 48 + $comp -custom -o llpp \ 49 + -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl \ 50 + str.cma unix.cma lablgl.cma \ 51 + link.o \ 52 + -cclib "$cclib" \ 53 + help.cmo \ 54 + utils.cmo \ 55 + parser.cmo \ 56 + wsi.cmo \ 57 + main.cmo 58 + ''; 59 + 60 + # Binary fails with 'No bytecode file specified.' if stripped. 61 + dontStrip = true; 62 + 63 + installPhase = '' 64 + install -d $out/bin 65 + install llpp llppac $out/bin 66 + ''; 67 + 68 + meta = { 69 + homepage = http://repo.or.cz/w/llpp.git; 70 + description = "A MuPDF based PDF pager written in OCaml"; 71 + platforms = stdenv.lib.platforms.linux; 72 + maintainers = [ stdenv.lib.maintainers.pSub ]; 73 + license = "GPL"; 74 + }; 75 + }
+2 -9
pkgs/applications/misc/mupdf/default.nix
··· 1 1 { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg 2 2 , libX11, libXext }: 3 3 stdenv.mkDerivation rec { 4 - name = "mupdf-1.3"; 4 + name = "mupdf-1.4"; 5 5 6 6 src = fetchurl { 7 7 url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; 8 - sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b"; 8 + sha256 = "08pc6fv42sb9k9dzjs8ph32nixzrzmr08yxh7arkpsdm42asp2q1"; 9 9 }; 10 - 11 - patches = [(fetchpatch { 12 - name = "CVE-2014-2013.patch"; 13 - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;" 14 - + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc"; 15 - sha256 = "0p721f3g2djz9fy6rcgj83c20f5k257wg2d0yvvmp02m7sp06l0g"; 16 - })]; 17 10 18 11 buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; 19 12
+1 -51
pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
··· 41 41 + 42 42 +##### Uncomment these for windows 43 43 +#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib 44 - +#GLLIBS = opengl32.lib glu32.lib 44 + +#GLLIBS = opengl32.lib glu32.lib 45 45 +#TOOLCHAIN = msvc 46 46 +#XA = .lib 47 47 +#XB = .bat ··· 65 65 + 66 66 +# C Compiler options 67 67 +#COPTS = -c -O 68 - diff -Naur lablGL.ori/META lablGL/META 69 - --- lablGL.ori/META 1970-01-01 01:00:00.000000000 +0100 70 - +++ lablGL/META 2013-06-02 22:00:59.000000000 +0200 71 - @@ -0,0 +1,21 @@ 72 - +description = "Bindings for OpenGL graphics engines" 73 - +version = "1.04-1" 74 - +archive(byte) = "lablgl.cma" 75 - +archive(native) = "lablgl.cmxa" 76 - + 77 - +#package "togl" ( 78 - +# description = "OpenGL widget for labltk" 79 - +# version = "1.01" 80 - +# requires = "lablgl, labltk" 81 - +# archive(byte) = "togl.cma" 82 - +# archive(native) = "togl.cmxa" 83 - +#) 84 - + 85 - +package "glut" ( 86 - + description = "Platform-independent OpenGL window" 87 - + version = "1.01" 88 - + requires = "lablgl" 89 - + archive(byte) = "lablglut.cma" 90 - + archive(native) = "lablglut.cmxa" 91 - +) 92 - + 93 - diff -Naur lablGL.ori/META~ lablGL/META~ 94 - --- lablGL.ori/META~ 1970-01-01 01:00:00.000000000 +0100 95 - +++ lablGL/META~ 2013-06-02 21:59:17.000000000 +0200 96 - @@ -0,0 +1,21 @@ 97 - +description = "Bindings for OpenGL graphics engines" 98 - +version = "1.04-1" 99 - +archive(byte) = "lablgl.cma" 100 - +archive(native) = "lablgl.cmxa" 101 - + 102 - +#package "togl" ( 103 - +# description = "OpenGL widget for labltk" 104 - +# version = "1.01" 105 - +# requires = "lablGL, labltk" 106 - +# archive(byte) = "togl.cma" 107 - +# archive(native) = "togl.cmxa" 108 - +#) 109 - + 110 - +package "glut" ( 111 - + description = "Platform-independent OpenGL window" 112 - + version = "1.01" 113 - + requires = "lablGL" 114 - + archive(byte) = "lablglut.cma" 115 - + archive(native) = "lablglut.cmxa" 116 - +) 117 - +
+4 -5
pkgs/development/ocaml-modules/lablgl/default.nix
··· 3 3 let 4 4 ocaml_version = (builtins.parseDrvName ocaml.name).version; 5 5 pname = "lablgl"; 6 - version = "1.04-1"; 6 + version = "1.05"; 7 7 in 8 8 9 9 stdenv.mkDerivation { 10 10 name = "${pname}-${version}"; 11 11 12 12 src = fetchurl { 13 - url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-20120306.tar.gz"; 14 - sha256 = "1w5di2n38h7fkrf668zphnramygwl7ybjhrmww3pi9jcf9apa09r"; 13 + url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; 14 + sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; 15 15 }; 16 16 17 17 buildInputs = [ocaml findlib lablgtk mesa freeglut ]; ··· 29 29 30 30 createFindlibDestdir = true; 31 31 32 - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; 33 32 buildFlags = "lib libopt glut glutopt"; 34 33 35 34 postInstall = '' ··· 40 39 homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; 41 40 description = "OpenGL bindings for ocaml"; 42 41 license = "GnuGPLV2"; 43 - # maintainers = [ stdenv.lib.maintainers.roconnor ]; 42 + maintainers = [ stdenv.lib.maintainers.psub ]; 44 43 }; 45 44 }
+2
pkgs/top-level/all-packages.nix
··· 8830 8830 bison = bison2; 8831 8831 }; 8832 8832 8833 + llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; 8834 + 8833 8835 lmms = callPackage ../applications/audio/lmms { }; 8834 8836 8835 8837 lxdvdrip = callPackage ../applications/video/lxdvdrip { };