Merge pull request #13133 from spacefrogg/evince-xps-support

gnome3.evince: Add XPS file support
This commit is contained in:
Jascha Geerds 2016-02-20 19:12:19 +01:00
commit 78c99d8f4e
2 changed files with 7 additions and 4 deletions

View File

@ -1,8 +1,9 @@
{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number , librsvg, gobjectIntrospection
, gobjectIntrospection , recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,11 +16,12 @@ stdenv.mkDerivation rec {
gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
poppler ghostscriptX djvulibre libspectre poppler ghostscriptX djvulibre libspectre
makeWrapper libsecret librsvg gnome3.adwaita-icon-theme makeWrapper libsecret librsvg gnome3.adwaita-icon-theme
]; ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
configureFlags = [ configureFlags = [
"--disable-nautilus" # Do not use nautilus "--disable-nautilus" # Do not use nautilus
"--enable-introspection" "--enable-introspection"
(if supportXPS then "--enable-xps" else "--disable-xps")
]; ];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";

View File

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
}; };
buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr];
propagatedBuildInputs = [ libarchive ];
configureFlags = "--without-liblcms2"; configureFlags = "--without-liblcms2";