diff options
| author | Jascha Geerds <jascha@jgeerds.name> | 2016-02-20 19:12:19 +0100 |
|---|---|---|
| committer | Jascha Geerds <jascha@jgeerds.name> | 2016-02-20 19:12:19 +0100 |
| commit | 78c99d8f4ec326665c889e30355cc9c82b30733c (patch) | |
| tree | 91199977ced517108bb00e08336f80ec64591a89 /pkgs/desktops | |
| parent | 686c09dd38a58287586da83ca31afd5dfbd3bf5c (diff) | |
| parent | 58cbe7d068ceb54951ba8fb68b31ba7c86c0a9cc (diff) | |
| download | nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.tar nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.tar.gz nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.tar.bz2 nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.tar.lz nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.tar.xz nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.tar.zst nixlib-78c99d8f4ec326665c889e30355cc9c82b30733c.zip | |
Merge pull request #13133 from spacefrogg/evince-xps-support
gnome3.evince: Add XPS file support
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index 154182eef887..3220e9060643 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -1,8 +1,9 @@ { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection +, librsvg, gobjectIntrospection +, recentListSize ? null # 5 is not enough, allow passing a different number +, supportXPS ? false # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { @@ -15,11 +16,12 @@ stdenv.mkDerivation rec { gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre makeWrapper libsecret librsvg gnome3.adwaita-icon-theme - ]; + ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ "--disable-nautilus" # Do not use nautilus "--enable-introspection" + (if supportXPS then "--enable-xps" else "--disable-xps") ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix index 72d307f4f1a7..5168dec203fa 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { 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"; |