Merge pull request NixOS#317382 from JohnRTitor/corefonts

corefonts: fix build
hdhog · Jun 5, 2024 · 22b57ba · 22b57ba
2 parents 70e5090 + 96f6a37
commit 22b57ba
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/pkgs/data/fonts/corefonts/no-op.conf → pkgs/by-name/co/corefonts/no-op.conf b/pkgs/data/fonts/corefonts/no-op.conf → pkgs/by-name/co/corefonts/no-op.conf
diff --git a/pkgs/data/fonts/corefonts/default.nix → pkgs/by-name/co/corefonts/package.nix b/pkgs/data/fonts/corefonts/default.nix → pkgs/by-name/co/corefonts/package.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;
 

diff --git 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 { };