From ac3d5c97b10c86011f403be69ba6ab0e72d4eda7 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:34:33 +0530
Subject: [PATCH 1/2] corefonts: fix build

---
 pkgs/data/fonts/corefonts/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix
index 059350da7d4f..1ad30af49383 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   version = "1";
 
   exes = map ({name, sha256}: fetchurl {
-    url = "mirror://sourceforge/corefonts/${name}32.exe";
+    url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe";
     inherit sha256;
   }) fonts;
 

From 96f6a37b84a5f028aff95f96213853197beee4a2 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:40:59 +0530
Subject: [PATCH 2/2] corefonts: move to pkgs/by-name

---
 pkgs/{data/fonts => by-name/co}/corefonts/no-op.conf            | 0
 .../corefonts/default.nix => by-name/co/corefonts/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{data/fonts => by-name/co}/corefonts/no-op.conf (100%)
 rename pkgs/{data/fonts/corefonts/default.nix => by-name/co/corefonts/package.nix} (100%)

diff --git a/pkgs/data/fonts/corefonts/no-op.conf b/pkgs/by-name/co/corefonts/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/corefonts/no-op.conf
rename to pkgs/by-name/co/corefonts/no-op.conf
diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/by-name/co/corefonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/corefonts/default.nix
rename to pkgs/by-name/co/corefonts/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66cdefee0b5b..d7e73d97edac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28327,8 +28327,6 @@ with pkgs;
 
   comixcursors = callPackage ../data/icons/comixcursors { };
 
-  corefonts = callPackage ../data/fonts/corefonts { };
-
   courier-prime = callPackage ../data/fonts/courier-prime { };
 
   cozette = callPackage ../data/fonts/cozette { };