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.
This commit is contained in:
Jan Tojnar
2021-05-05 22:43:06 +02:00
parent f93021816c
commit 11f0852a64
@@ -1,21 +1,49 @@
{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee { lib
, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: , stdenv
let , 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"; version = "3.38.0";
pname = "gnome-latex"; pname = "gnome-latex";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8";
}; };
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; patches = [
configureFlags = ["--disable-dconf-migration"]; # Fix build with latest tepl.
(fetchpatch {
url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch";
sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
autoreconfHook
gtk-doc
vala
gobject-introspection
wrapGAppsHook wrapGAppsHook
itstool itstool
intltool intltool
@@ -33,8 +61,14 @@ in stdenv.mkDerivation {
tepl tepl
]; ];
configureFlags = [
"--disable-dconf-migration"
];
doCheck = true; doCheck = true;
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
passthru.updateScript = gnome3.updateScript { passthru.updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";