From e9742cf527bd947cfbf6674430efdf74aee0f12c Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Sep 2025 23:53:11 +0200 Subject: [PATCH] font-bitstream-{100dpi,75dpi,type1}: move font output from $out/lib to $out/share --- pkgs/by-name/fo/font-bitstream-100dpi/package.nix | 2 +- pkgs/by-name/fo/font-bitstream-75dpi/package.nix | 2 +- pkgs/by-name/fo/font-bitstream-type1/package.nix | 4 +--- pkgs/servers/x11/xorg/overrides.nix | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix index 70bdb81636af..380c99a83401 100644 --- a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix +++ b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix index acdae17bca71..3dd6e249b0df 100644 --- a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix +++ b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bitstream-type1/package.nix b/pkgs/by-name/fo/font-bitstream-type1/package.nix index 3e3d1eb6c35e..0fe3b97a951a 100644 --- a/pkgs/by-name/fo/font-bitstream-type1/package.nix +++ b/pkgs/by-name/fo/font-bitstream-type1/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { fontforge ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postBuild = '' # convert Postscript (Type 1) font to otf for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do @@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # install the otf fonts - fontDir="$out/lib/X11/fonts/misc" + fontDir="$out/share/fonts/X11/otf" install -Dm444 -t "$fontDir" *.otf mkfontscale "$fontDir" ''; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1952faf1bd14..215effdaa986 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -902,5 +902,5 @@ self: super: # deprecate some packages // lib.optionalAttrs config.allowAliases { - fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; + fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24 }