From 11f0852a640552a5bf64e30a5037bb499cd21373 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 26 Apr 2021 00:46:26 +0200 Subject: [PATCH] gnome-latex: fix build with tepl 6 Applying a patch since the app has been archived and will receive no further releases. Had to rebuild the build scripts with autoreconfHook since the patch modifies configure.ac. Also cleaned up the expression a bit. --- .../editors/gnome-latex/default.nix | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index a1cb03ae9e34..277863244a59 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,21 +1,49 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: -let +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, gtk-doc +, vala +, gobject-introspection +, wrapGAppsHook +, gsettings-desktop-schemas +, gspell +, gtksourceview4 +, libgee +, tepl +, amtk +, gnome3 +, glib +, pkg-config +, intltool +, itstool +, libxml2 +}: + +stdenv.mkDerivation rec { version = "3.38.0"; pname = "gnome-latex"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - configureFlags = ["--disable-dconf-migration"]; + patches = [ + # Fix build with latest tepl. + (fetchpatch { + url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; + sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; + }) + ]; nativeBuildInputs = [ pkg-config + autoreconfHook + gtk-doc + vala + gobject-introspection wrapGAppsHook itstool intltool @@ -33,8 +61,14 @@ in stdenv.mkDerivation { tepl ]; + configureFlags = [ + "--disable-dconf-migration" + ]; + doCheck = true; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + passthru.updateScript = gnome3.updateScript { packageName = pname; versionPolicy = "odd-unstable";