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

gnome3.evince: Add XPS file support

+7 -4
+5 -3
pkgs/desktops/gnome-3/3.18/core/evince/default.nix
··· 1 1 { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 2 2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 3 3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper 4 - , librsvg, recentListSize ? null # 5 is not enough, allow passing a different number 5 - , gobjectIntrospection 4 + , librsvg, gobjectIntrospection 5 + , recentListSize ? null # 5 is not enough, allow passing a different number 6 + , supportXPS ? false # Open XML Paper Specification via libgxps 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 15 16 gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas 16 17 poppler ghostscriptX djvulibre libspectre 17 18 makeWrapper libsecret librsvg gnome3.adwaita-icon-theme 18 - ]; 19 + ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; 19 20 20 21 configureFlags = [ 21 22 "--disable-nautilus" # Do not use nautilus 22 23 "--enable-introspection" 24 + (if supportXPS then "--enable-xps" else "--disable-xps") 23 25 ]; 24 26 25 27 NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+2 -1
pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix
··· 10 10 sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; 11 11 }; 12 12 13 - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; 13 + buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr]; 14 + propagatedBuildInputs = [ libarchive ]; 14 15 15 16 configureFlags = "--without-liblcms2"; 16 17