diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-26 00:46:26 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-05 22:43:06 +0200 |
commit | 11f0852a640552a5bf64e30a5037bb499cd21373 (patch) | |
tree | 5ff580b030a1097afb228df65c2f5f2844efeff3 /pkgs/applications/editors/gnome-latex | |
parent | f93021816ce193034675a92e9110ca14fc8a0ccd (diff) |
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.
Diffstat (limited to 'pkgs/applications/editors/gnome-latex')
-rw-r--r-- | pkgs/applications/editors/gnome-latex/default.nix | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index a1cb03ae9e343..277863244a594 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"; |