diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix index 6d4bbd062237..b1fbefb4e7cf 100644 --- a/pkgs/by-name/ba/balsa/package.nix +++ b/pkgs/by-name/ba/balsa/package.nix @@ -1,41 +1,44 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, glib, gmime3, gnutls, - gobject-introspection, gpgme, gtk3, gtksourceview4, gtkspell3, - intltool, libcanberra-gtk3, libesmtp, libical, libnotify, libsecret, openssl, + meson, + ninja, pkg-config, sqlite, webkitgtk_4_0, wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "balsa"; - version = "2.6.4"; + version = "2.6.5"; - src = fetchurl { - url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.xz"; - sha256 = "1hcgmjka2x2igdrmvzlfs12mv892kv4vzv5iy90kvcqxa625kymy"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "balsa"; + tag = finalAttrs.version; + hash = "sha256-KvgDIFbXmVkTqOibKF+8UhupEDgdhje600aSbmeKZqo="; }; nativeBuildInputs = [ + meson + ninja pkg-config - intltool - gobject-introspection wrapGAppsHook3 ]; @@ -57,6 +60,10 @@ stdenv.mkDerivation rec { webkitgtk_4_0 ]; + mesonFlags = [ + (lib.mesonOption "sysconfdir" "etc") + ]; + configureFlags = [ "--with-canberra" "--with-gtksourceview" @@ -70,11 +77,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { - homepage = "http://pawsa.fedorapeople.org/balsa/"; + meta = { description = "E-mail client for GNOME"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + homepage = "https://gitlab.gnome.org/GNOME/balsa"; + changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog"; + mainProgram = "balsa"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ timon ]; }; -} +})