From 7abbe6b31ef74a20b96405abaf09c4a0773d3f44 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Sep 2025 21:43:46 +0200 Subject: [PATCH] font-bh-lucidatypewriter-100dpi: refactor, move to pkgs/by-name & rename from xorg.fontbhlucidatypewriter100dpi this doesn't change the package output' --- .../package.nix | 52 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 43 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix new file mode 100644 index 000000000000..d25eabfe905a --- /dev/null +++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bh-lucidatypewriter-100dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-duwJ7aQJSinUe5HPWcProinI99HKa64qu7P5JeM96PI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + 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 = "Lucida Sans Typewriter 100dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi"; + # no license just a copyright notice + license = lib.licenses.unfree; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 568ff545aafd..685603d467a3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,6 +5,7 @@ font-alias, font-bh-100dpi, font-bh-75dpi, + font-bh-lucidatypewriter-100dpi, font-bh-ttf, font-bh-type1, font-encodings, @@ -122,6 +123,7 @@ self: with self; { fontalias = font-alias; fontbh100dpi = font-bh-100dpi; fontbh75dpi = font-bh-75dpi; + fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; @@ -538,47 +540,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter100dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bh-lucidatypewriter-100dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz"; - sha256 = "1wp87pijbydkpcmawsyas7vwhad2xg1mkkwigga2jjh9lknhkv3n"; - }; - 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! fontbhlucidatypewriter75dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index f025450bddc9..40b2c2ec1e4e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -321,6 +321,7 @@ print OUT <