font-mutt-misc: refactor, move to pkgs/by-name and rename from xorg.fontmuttmisc

relevant changes:
- remove some dependencies that don't seem to be needed
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
This commit is contained in:
quantenzitrone
2025-08-26 15:41:39 +02:00
parent 472fb3da5a
commit a525a830f2
4 changed files with 46 additions and 41 deletions
@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchurl,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-mutt-misc";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-mutt-misc-${finalAttrs.version}.tar.xz";
hash = "sha256-sSNZ9OEsI7z8tEi5GCl+l1+pG+9Sk9iNPCU0PMdouyQ=";
};
strictDeps = true;
nativeBuildInputs = [
bdftopcf
mkfontscale
];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/font/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "ClearU pcf fonts";
homepage = "https://gitlab.freedesktop.org/xorg/font/mutt-misc";
license = lib.licenses.mit;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
+2 -40
View File
@@ -6,6 +6,7 @@
font-bh-ttf,
font-bh-type1,
font-encodings,
font-mutt-misc,
font-util,
gccmakedep,
ico,
@@ -92,6 +93,7 @@ self: with self; {
fontalias = font-alias;
fontbhttf = font-bh-ttf;
fontbhtype1 = font-bh-type1;
fontmuttmisc = font-mutt-misc;
fontutil = font-util;
libAppleWM = libapplewm;
libFS = libfs;
@@ -1283,46 +1285,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontmuttmisc = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-mutt-misc";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz";
sha256 = "095vd33kqd157j6xi4sjxwdsjpwpgqliifa8nkybq8rcw7s5j8xi";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
mkfontscale
];
buildInputs = [ fontutil ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontschumachermisc = callPackage (
{
@@ -299,6 +299,7 @@ print OUT <<EOF;
font-bh-ttf,
font-bh-type1,
font-encodings,
font-mutt-misc,
font-util,
gccmakedep,
ico,
@@ -385,6 +386,7 @@ self: with self; {
fontalias = font-alias;
fontbhttf = font-bh-ttf;
fontbhtype1 = font-bh-type1;
fontmuttmisc = font-mutt-misc;
fontutil = font-util;
libAppleWM = libapplewm;
libFS = libfs;
-1
View File
@@ -131,7 +131,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz
mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz