diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-01 00:37:57 -0400 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:20 +0200 |
commit | 04b726c032af4c2a8ba9fe0113ff8b25da308b72 (patch) | |
tree | 6d0c89aa42755631dddc6cfea04f16fbfef403c3 /pkgs/desktops/gnome-3 | |
parent | 7543b25e3746c7e2880f5cebeb8f1ff0be02bef6 (diff) | |
download | nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.tar nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.tar.gz nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.tar.bz2 nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.tar.lz nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.tar.xz nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.tar.zst nixlib-04b726c032af4c2a8ba9fe0113ff8b25da308b72.zip |
gnome3.evince: 3.32.0 -> 3.34.0
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/core/evince/default.nix | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 9313ca8990c9..ee4e619332cc 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,6 +1,5 @@ -{ fetchFromGitLab -, stdenv -, fetchpatch +{ stdenv +, fetchFromGitLab , meson , ninja , pkgconfig @@ -34,6 +33,9 @@ , texlive , t1lib , gst_all_1 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps @@ -41,64 +43,62 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.32.0"; + version = "3.34.0"; + outputs = [ "out" "dev" "devdoc" ]; + + # meson.build not distributed + # See: https://gitlab.gnome.org/GNOME/evince/issues/1270 src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r"; + sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr"; }; - - patches = [ - (fetchpatch { - name = "CVE-2019-11459.patch"; - url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch"; - sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py ''; nativeBuildInputs = [ + appstream + docbook-xsl-nons + docbook_xml_dtd_43 + gettext + gobject-introspection + gtk-doc + itstool meson ninja pkgconfig - gobject-introspection - gettext - itstool - yelp-tools - appstream - wrapGAppsHook python3 + wrapGAppsHook + yelp-tools ]; buildInputs = [ - glib - gtk3 - pango + adwaita-icon-theme atk + dbus # only needed to find the service directory + djvulibre gdk-pixbuf - libxml2 - gsettings-desktop-schemas - poppler ghostscriptX - djvulibre - libspectre + glib + gnome-desktop + gsettings-desktop-schemas + gspell + gtk3 libarchive - libsecret librsvg - adwaita-icon-theme - gspell - gnome-desktop - dbus # only needed to find the service directory - texlive.bin.core # kpathsea for DVI support + libsecret + libspectre + libxml2 + pango + poppler t1lib + texlive.bin.core # kpathsea for DVI support ] ++ stdenv.lib.optional supportXPS libgxps ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); @@ -106,7 +106,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dnautilus=false" "-Dps=enabled" - "-Dgtk_doc=false" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; |