From f2bc6531eadabdce0016361186467d937a2fbb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 6 Mar 2019 01:29:53 +0100 Subject: [PATCH] gnome3.gnome-documents: 3.30.0 -> 3.32.0 --- .../gnome-3/apps/gnome-documents/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 186f3a14d271..a2cba36b88d9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -8,16 +8,19 @@ stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6"; + sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; }; doCheck = true; - mesonFlags = [ "-Dgetting-started=true" ]; + mesonFlags = [ + "-Dgetting-started=true" + "--buildtype=plain" + ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 @@ -31,14 +34,6 @@ stdenv.mkDerivation rec { gnome-desktop libzapojit libgepub ]; - patches = [ - # fix RPATH to libgd - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch"; - sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py