diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 46b8fc44a01b..e8d86ae5898c 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,8 +1,11 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, + gtk-doc, + mate-common, pkg-config, gettext, itstool, @@ -18,31 +21,31 @@ mate-desktop, hicolor-icon-theme, wrapGAppsHook3, + yelp-tools, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "eom"; - version = "1.28.0"; + version = "1.28.1"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/eom-${finalAttrs.version}.tar.xz"; - sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "eom"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2MO8z30Styv5vAnNVFpETAZtZ+LMbgBSDq1mUQZ9X1c="; }; - patches = [ - # Switch to girepository-2.0 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/eom/raw/84b45dc6302f378926be390d39a7cca3ec4f26ea/f/libpeas1_pygobject352.patch"; - hash = "sha256-HcwWXAnVzz5uuAz8Mljci2FA72TZJTD28qLvczXVtZU="; - }) - ]; - nativeBuildInputs = [ + autoconf-archive + autoreconfHook + gtk-doc + mate-common # mate-common.m4 macros pkg-config gettext itstool wrapGAppsHook3 + yelp-tools ]; buildInputs = [ @@ -62,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - url = "https://git.mate-desktop.org/eom"; odd-unstable = true; rev-prefix = "v"; };