font-adobe-100dpi: refactor, move to pkgs/by-name and rename from xorg.fontadobe100dpi

relevant changes:
- 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 also fixes one occasion i could find in nixpkgs where the font path was relevant

authored by quantenzitrone and committed by Alyssa Ross 657ebfdd f8136a0f

+56 -43
+51
pkgs/by-name/fo/font-adobe-100dpi/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + font-util, 7 + bdftopcf, 8 + mkfontscale, 9 + writeScript, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "font-adobe-100dpi"; 13 + version = "1.0.4"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/font/font-adobe-100dpi-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-tnr/RF4FYyjVP5cy05iE9V3Y0wP8Ja89u6M6i6NanM8="; 18 + }; 19 + 20 + strictDeps = true; 21 + 22 + nativeBuildInputs = [ 23 + pkg-config 24 + bdftopcf 25 + font-util 26 + mkfontscale 27 + ]; 28 + 29 + buildInputs = [ font-util ]; 30 + 31 + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; 32 + 33 + passthru = { 34 + updateScript = writeScript "update-${finalAttrs.pname}" '' 35 + #!/usr/bin/env nix-shell 36 + #!nix-shell -i bash -p common-updater-scripts 37 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 38 + --url https://xorg.freedesktop.org/releases/individual/font/ \ 39 + | sort -V | tail -n1)" 40 + update-source-version ${finalAttrs.pname} "$version" 41 + ''; 42 + }; 43 + 44 + meta = { 45 + description = "Adobe 100dpi pcf fonts"; 46 + homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-100dpi"; 47 + license = lib.licenses.hpndSellVariant; # plus a trademark that doesn't change the license 48 + maintainers = [ ]; 49 + platforms = lib.platforms.unix; 50 + }; 51 + })
+1 -1
pkgs/by-name/xd/xdummy/package.nix
··· 30 30 ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" 31 31 XkbDir "${xkeyboard_config}/share/X11/xkb" 32 32 FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi" 33 - FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" 33 + FontPath "${xorg.fontadobe100dpi}/share/fonts/X11/100dpi" 34 34 FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" 35 35 FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" 36 36 ${lib.optionalString unfreeFonts ''
+2 -41
pkgs/servers/x11/xorg/default.nix
··· 2 2 { 3 3 lib, 4 4 bdftopcf, 5 + font-adobe-100dpi, 5 6 font-adobe-75dpi, 6 7 font-alias, 7 8 font-bh-ttf, ··· 118 119 xwud 119 120 ; 120 121 encodings = font-encodings; 122 + fontadobe100dpi = font-adobe-100dpi; 121 123 fontadobe75dpi = font-adobe-75dpi; 122 124 fontalias = font-alias; 123 125 fontbhttf = font-bh-ttf; ··· 286 288 xorgproto 287 289 libXt 288 290 ]; 289 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 290 - meta = { 291 - pkgConfigModules = [ ]; 292 - platforms = lib.platforms.unix; 293 - }; 294 - }) 295 - ) { }; 296 - 297 - # THIS IS A GENERATED FILE. DO NOT EDIT! 298 - fontadobe100dpi = callPackage ( 299 - { 300 - stdenv, 301 - pkg-config, 302 - fetchurl, 303 - fontutil, 304 - bdftopcf, 305 - mkfontscale, 306 - testers, 307 - }: 308 - stdenv.mkDerivation (finalAttrs: { 309 - pname = "font-adobe-100dpi"; 310 - version = "1.0.4"; 311 - builder = ./builder.sh; 312 - src = fetchurl { 313 - url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz"; 314 - sha256 = "1kwwbaiqnfm3pcysy9gw0g9xhpgmhjcd6clp7zajhqq5br2gyymn"; 315 - }; 316 - hardeningDisable = [ 317 - "bindnow" 318 - "relro" 319 - ]; 320 - strictDeps = true; 321 - nativeBuildInputs = [ 322 - pkg-config 323 - bdftopcf 324 - fontutil 325 - mkfontscale 326 - ]; 327 - buildInputs = [ fontutil ]; 328 - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; 329 - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; 330 291 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 331 292 meta = { 332 293 pkgConfigModules = [ ];
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 318 318 { 319 319 lib, 320 320 bdftopcf, 321 + font-adobe-100dpi, 321 322 font-adobe-75dpi, 322 323 font-alias, 323 324 font-bh-ttf, ··· 434 435 xwud 435 436 ; 436 437 encodings = font-encodings; 438 + fontadobe100dpi = font-adobe-100dpi; 437 439 fontadobe75dpi = font-adobe-75dpi; 438 440 fontalias = font-alias; 439 441 fontbhttf = font-bh-ttf;
-1
pkgs/servers/x11/xorg/tarballs.list
··· 93 93 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz 94 94 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz 95 95 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 96 - mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz 97 96 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz 98 97 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz 99 98 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz