From 8674efe537f5907a9b5488aa8a676f54f438b11b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 3 Mar 2025 22:07:53 +0800
Subject: [PATCH 1/2] adwaita-fonts: Remove unused dependencies

The upstream meson.build only contains a single install_data() and
gnome-common is dead.
---
 pkgs/by-name/ad/adwaita-fonts/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix
index 9eb7280d2c0b..52f79327a0ab 100644
--- a/pkgs/by-name/ad/adwaita-fonts/package.nix
+++ b/pkgs/by-name/ad/adwaita-fonts/package.nix
@@ -1,15 +1,12 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchFromGitLab,
-  pkg-config,
   meson,
   ninja,
-  glib,
-  gnome-common,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adwaita-fonts";
   version = "48.2";
 
@@ -22,21 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    pkg-config
     meson
     ninja
   ];
 
-  buildInputs = [
-    glib
-    gnome-common
-  ];
-
   meta = {
     description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter";
     homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.qxrein ];
+    maintainers = [ lib.maintainers.qxrein ] ++ lib.teams.gnome.members;
   };
 })

From 4b1a4f861bc5cf3969b2a8536eb859432ed85f2f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 3 Mar 2025 22:33:01 +0800
Subject: [PATCH 2/2] adwaita-fonts: Add update script

So this is handled in GNOME bulk updates.
---
 pkgs/by-name/ad/adwaita-fonts/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix
index 52f79327a0ab..d1b044794793 100644
--- a/pkgs/by-name/ad/adwaita-fonts/package.nix
+++ b/pkgs/by-name/ad/adwaita-fonts/package.nix
@@ -1,21 +1,19 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitLab,
+  fetchurl,
   meson,
   ninja,
+  gnome,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adwaita-fonts";
   version = "48.2";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "adwaita-fonts";
-    tag = "${finalAttrs.version}";
-    hash = "sha256-rXr4U5k0MUz766F5kVssZfM6Ra/hQOe/HLpGss2aZuo=";
+  src = fetchurl {
+    url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz";
+    hash = "sha256-FW9+kvL4LlJ/xzwwnbsjfApKXDqVvF7pSl77aUfFU+A=";
   };
 
   nativeBuildInputs = [
@@ -23,6 +21,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ninja
   ];
 
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "adwaita-fonts";
+    };
+  };
+
   meta = {
     description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter";
     homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts";