gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

font-bitstream-{100dpi,75dpi,type1}: move font output from $out/lib to $out/share

Browse Source
This commit is contained in:
quantenzitrone
2025-09-24 16:42:25 +02:00
parent 4c4fd26ced
commit e9742cf527
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fo/font-bitstream-100dpi/package.nix
+1 -1
View File
@@ -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}" ''
pkgs/by-name/fo/font-bitstream-75dpi/package.nix
+1 -1
View File
@@ -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}" ''
pkgs/by-name/fo/font-bitstream-type1/package.nix
+1 -3
View File
@@ -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"
'';
pkgs/servers/x11/xorg/overrides.nix
+1 -1
View File
@@ -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
}