From 96da79305ec2cc50e3f159bf1273744957851905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:37:06 +0100 Subject: [PATCH] gnome3.gedit: 3.30.2 -> 3.32.0 - port to meson - now require perl at build time - now require itstool - parallal building fails --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 33 ++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 8310f426be6..f767e309a65 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,28 +1,43 @@ -{ stdenv, intltool, fetchurl +{ stdenv, meson, fetchurl, python3 , pkgconfig, gtk3, glib, adwaita-icon-theme -, libpeas, gtksourceview, gsettings-desktop-schemas -, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, gspell }: +, libpeas, gtksourceview4, gsettings-desktop-schemas +, wrapGAppsHook, ninja, libsoup, libxml2 +, gnome3, gspell, perl, itstool, desktop-file-utils }: stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza"; + sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook meson ninja libxml2 + python3 perl itstool desktop-file-utils + ]; buildInputs = [ gtk3 glib adwaita-icon-theme libsoup - libpeas gtksourceview + libpeas gtksourceview4 gsettings-desktop-schemas gspell ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x build-aux/meson/post_install.py + chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl + patchShebangs build-aux/meson/post_install.py + patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl + ''; + + mesonFlags = [ + "--buildtype=plain" # don't require git + ]; + + # Reliably fails to generate gedit-file-browser-enum-types.h in time + enableParallelBuilding = false; passthru = { updateScript = gnome3.updateScript {