diff options
author | Robin Gloster <mail@glob.in> | 2016-02-20 22:27:33 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-20 22:27:33 +0000 |
commit | 4036e9ba8cd8aa450e27541daa31d490a4e79d38 (patch) | |
tree | cdfaf300d05204afb4b51bcd58dc4350d2b42d5a /pkgs/desktops/gnome-3 | |
parent | 8641b9dec4d6d66c7414f4c64f38e70be89b2af7 (diff) | |
parent | 3e7e8e88078b6e73b7b72aa64efd87bf4feedc2c (diff) | |
download | nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.gz nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.bz2 nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.lz nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.xz nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.tar.zst nixlib-4036e9ba8cd8aa450e27541daa31d490a4e79d38.zip |
Merge branch 'up' into hardened-stdenv
Diffstat (limited to 'pkgs/desktops/gnome-3')
-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"; |