From f8136a0f82e7f36b9e412c75645efc00fb9411d4 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sat, 26 Apr 2025 22:29:51 +0200 Subject: [PATCH] font-adobe-75dpi: refactor, move to pkgs/by-name and rename from xorg.fontadobe75dpi 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 --- pkgs/by-name/fo/font-adobe-75dpi/package.nix | 51 +++++++++++++++++++ pkgs/by-name/xd/xdummy/package.nix | 2 +- pkgs/servers/x11/xorg/default.nix | 43 +--------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/fo/font-adobe-75dpi/package.nix diff --git a/pkgs/by-name/fo/font-adobe-75dpi/package.nix b/pkgs/by-name/fo/font-adobe-75dpi/package.nix new file mode 100644 index 000000000000..444c0f4335b6 --- /dev/null +++ b/pkgs/by-name/fo/font-adobe-75dpi/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-adobe-75dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-75dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-EoGmLb7e0WnklcrhpbSH4fM28rTZcdkpEcWcEDmZuRE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; + + 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 = "Adobe 75dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-75dpi"; + license = lib.licenses.hpndSellVariant; # plus a trademark that doesn't change the license + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix index 399226c7fc85..df0911e1299f 100644 --- a/pkgs/by-name/xd/xdummy/package.nix +++ b/pkgs/by-name/xd/xdummy/package.nix @@ -29,7 +29,7 @@ let ModulePath "${xorg.xorgserver.out}/lib/xorg/modules" ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" XkbDir "${xkeyboard_config}/share/X11/xkb" - FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi" FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 15acd52e9e48..c13ec42c4435 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2,6 +2,7 @@ { lib, bdftopcf, + font-adobe-75dpi, font-alias, font-bh-ttf, font-bh-type1, @@ -117,6 +118,7 @@ self: with self; { xwud ; encodings = font-encodings; + fontadobe75dpi = font-adobe-75dpi; fontalias = font-alias; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; @@ -333,47 +335,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobe75dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-adobe-75dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz"; - sha256 = "04drk4wi176524lxjwfrnkr3dwz1hysabqfajpj6klfypqnsd08j"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - fontutil - 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! fontadobeutopia100dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0abd26780af1..240fd3d930d1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -318,6 +318,7 @@ print OUT <