poppler: update; but openjpeg still not detected

This commit is contained in:
Vladimír Čunát 2013-02-12 21:40:20 +01:00
parent b874124d85
commit b41ec8f8eb

View File

@ -1,23 +1,25 @@
{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib { fetchurl, stdenv, cairo, freetype, fontconfig, zlib
, libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg , libjpeg, curl, libpthreadstubs, xorg, openjpeg
, libxml2, pkgconfig, cmake, lcms , libxml2, pkgconfig, cmake, lcms2
, gtkSupport ? false, glib ? null, gtk ? null , gtkSupport ? false, glib ? null, gtk3 ? null # gtk2 no longer accepted
, qt4Support ? false, qt4 ? null , qt4Support ? false, qt4 ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "poppler-0.18.4"; name = "poppler-0.22.1";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}${name}.tar.gz"; url = "${meta.homepage}${name}.tar.gz";
sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; sha256 = "1h4p241k7ysm7mb8wgwi7ilp69z297d7ql5padb0dnmzq39sddhj";
}; };
propagatedBuildInputs = propagatedBuildInputs = with xorg;
[ zlib cairo freetype fontconfig libjpeg lcms pixman curl [ zlib cairo freetype fontconfig libjpeg lcms2 curl
libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc libpthreadstubs libxml2 stdenv.gcc.libc
libXau libXdmcp libxcb libXrender libXext
#openjpeg # not detected
] ]
++ stdenv.lib.optionals gtkSupport [ glib gtk ] ++ stdenv.lib.optionals gtkSupport [ glib /*gtk3*/ ]
++ stdenv.lib.optional qt4Support qt4; ++ stdenv.lib.optional qt4Support qt4;
buildNativeInputs = [ pkgconfig cmake ]; buildNativeInputs = [ pkgconfig cmake ];