gnome-online-accounts: Switch back to GNOME sources

Partially reverts 5366676eba.
Meson is now the only build system.

Also switch to finalAttrs pattern.
This commit is contained in:
Jan Tojnar 2024-03-10 17:46:02 +01:00
parent 69acd20548
commit e9c8a18918

View file

@ -1,6 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchurl
, fetchpatch , fetchpatch
, pkg-config , pkg-config
, vala , vala
@ -31,18 +31,15 @@
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts"; pname = "gnome-online-accounts";
version = "3.48.0"; version = "3.48.0";
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
src = fetchFromGitLab { src = fetchurl {
domain = "gitlab.gnome.org"; url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
owner = "GNOME"; hash = "sha256-QYu5/P/b1yqYIFrTZRN2F/weNVGlTedPapjUXSZhdb8=";
repo = "gnome-online-accounts";
rev = version;
sha256 = "sha256-USl0Qay9pSgbbp3n/L8eBaRQwaBYledht5j+afmo++o=";
}; };
patches = [ patches = [
@ -100,7 +97,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
packageName = pname; packageName = "gnome-online-accounts";
}; };
}; };
@ -111,4 +108,4 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
} })