From e0d8c80f010f6bdc2839630a84603f0648cdc9bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Jul 2018 11:33:51 +0200 Subject: [PATCH] =?UTF-8?q?gnome3.devhelp:=203.28.1=20=E2=86=92=203.30.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/devtools/devhelp/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 97a425bccb1..63fa2ebddcf 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, glib, appstream-glib, gobjectIntrospection +{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook +, glib, amtk, appstream-glib, gobjectIntrospection , webkitgtk, gettext, itstool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "devhelp-${version}"; - version = "3.28.1"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s"; + sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5"; }; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; buildInputs = [ - glib gtk3 webkitgtk + glib gtk3 webkitgtk amtk gnome3.defaultIconTheme gsettings-desktop-schemas ]; + doCheck = true; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "devhelp";