From 6d6a7881efea68cadd1237a4c3f0bb652a7157b1 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:11:28 +0100 Subject: [PATCH 1/2] gnome3.libgxps: Fix dependency propagation bug Packages that want to use libgxps also need libarchive, thus it is moved to propagatedBuildInputs. --- pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 72d307f4f1a..5168dec203f 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"; From 58cbe7d068ceb54951ba8fb68b31ba7c86c0a9cc Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:15:19 +0100 Subject: [PATCH 2/2] gnome3.evince: Add XPS file support XPS support is optional via supportXPS argument and turned off by default. --- pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 154182eef88..3220e906064 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";