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

+46 -41
+42
pkgs/by-name/fo/font-mutt-misc/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + bdftopcf, 6 + mkfontscale, 7 + writeScript, 8 + }: 9 + stdenv.mkDerivation (finalAttrs: { 10 + pname = "font-mutt-misc"; 11 + version = "1.0.4"; 12 + 13 + src = fetchurl { 14 + url = "mirror://xorg/individual/font/font-mutt-misc-${finalAttrs.version}.tar.xz"; 15 + hash = "sha256-sSNZ9OEsI7z8tEi5GCl+l1+pG+9Sk9iNPCU0PMdouyQ="; 16 + }; 17 + 18 + strictDeps = true; 19 + nativeBuildInputs = [ 20 + bdftopcf 21 + mkfontscale 22 + ]; 23 + 24 + passthru = { 25 + updateScript = writeScript "update-${finalAttrs.pname}" '' 26 + #!/usr/bin/env nix-shell 27 + #!nix-shell -i bash -p common-updater-scripts 28 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 29 + --url https://xorg.freedesktop.org/releases/individual/font/ \ 30 + | sort -V | tail -n1)" 31 + update-source-version ${finalAttrs.pname} "$version" 32 + ''; 33 + }; 34 + 35 + meta = { 36 + description = "ClearU pcf fonts"; 37 + homepage = "https://gitlab.freedesktop.org/xorg/font/mutt-misc"; 38 + license = lib.licenses.mit; 39 + maintainers = [ ]; 40 + platforms = lib.platforms.unix; 41 + }; 42 + })
+2 -40
pkgs/servers/x11/xorg/default.nix
··· 6 font-bh-ttf, 7 font-bh-type1, 8 font-encodings, 9 font-util, 10 gccmakedep, 11 ico, ··· 92 fontalias = font-alias; 93 fontbhttf = font-bh-ttf; 94 fontbhtype1 = font-bh-type1; 95 fontutil = font-util; 96 libAppleWM = libapplewm; 97 libFS = libfs; ··· 1270 pkg-config 1271 bdftopcf 1272 fontutil 1273 - mkfontscale 1274 - ]; 1275 - buildInputs = [ fontutil ]; 1276 - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; 1277 - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; 1278 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1279 - meta = { 1280 - pkgConfigModules = [ ]; 1281 - platforms = lib.platforms.unix; 1282 - }; 1283 - }) 1284 - ) { }; 1285 - 1286 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1287 - fontmuttmisc = callPackage ( 1288 - { 1289 - stdenv, 1290 - pkg-config, 1291 - fetchurl, 1292 - fontutil, 1293 - bdftopcf, 1294 - mkfontscale, 1295 - testers, 1296 - }: 1297 - stdenv.mkDerivation (finalAttrs: { 1298 - pname = "font-mutt-misc"; 1299 - version = "1.0.4"; 1300 - builder = ./builder.sh; 1301 - src = fetchurl { 1302 - url = "mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz"; 1303 - sha256 = "095vd33kqd157j6xi4sjxwdsjpwpgqliifa8nkybq8rcw7s5j8xi"; 1304 - }; 1305 - hardeningDisable = [ 1306 - "bindnow" 1307 - "relro" 1308 - ]; 1309 - strictDeps = true; 1310 - nativeBuildInputs = [ 1311 - pkg-config 1312 - bdftopcf 1313 mkfontscale 1314 ]; 1315 buildInputs = [ fontutil ];
··· 6 font-bh-ttf, 7 font-bh-type1, 8 font-encodings, 9 + font-mutt-misc, 10 font-util, 11 gccmakedep, 12 ico, ··· 93 fontalias = font-alias; 94 fontbhttf = font-bh-ttf; 95 fontbhtype1 = font-bh-type1; 96 + fontmuttmisc = font-mutt-misc; 97 fontutil = font-util; 98 libAppleWM = libapplewm; 99 libFS = libfs; ··· 1272 pkg-config 1273 bdftopcf 1274 fontutil 1275 mkfontscale 1276 ]; 1277 buildInputs = [ fontutil ];
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 299 font-bh-ttf, 300 font-bh-type1, 301 font-encodings, 302 font-util, 303 gccmakedep, 304 ico, ··· 385 fontalias = font-alias; 386 fontbhttf = font-bh-ttf; 387 fontbhtype1 = font-bh-type1; 388 fontutil = font-util; 389 libAppleWM = libapplewm; 390 libFS = libfs;
··· 299 font-bh-ttf, 300 font-bh-type1, 301 font-encodings, 302 + font-mutt-misc, 303 font-util, 304 gccmakedep, 305 ico, ··· 386 fontalias = font-alias; 387 fontbhttf = font-bh-ttf; 388 fontbhtype1 = font-bh-type1; 389 + fontmuttmisc = font-mutt-misc; 390 fontutil = font-util; 391 libAppleWM = libapplewm; 392 libFS = libfs;
-1
pkgs/servers/x11/xorg/tarballs.list
··· 131 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz 132 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz 133 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz 134 - mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz 135 mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz 136 mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz 137 mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
··· 131 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz 132 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz 133 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz 134 mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz 135 mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz 136 mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz