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

font-bh{,-lucidatypewriter}-{100,75}dpi: move font from $out/lib to $out/share

Browse Source 
also fixes the paths in xdummy to point to the new font locations
This commit is contained in:
quantenzitrone
2025-09-13 22:35:49 +02:00
parent 837e11d2c3
commit ab33dd85d4
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fo/font-bh-100dpi/package.nix
+1 -1
View File
@@ -28,7 +28,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-bh-75dpi/package.nix
+1 -1
View File
@@ -28,7 +28,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-bh-lucidatypewriter-100dpi/package.nix
+1 -1
View File
@@ -28,7 +28,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-bh-lucidatypewriter-75dpi/package.nix
+1 -1
View File
@@ -28,7 +28,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/xd/xdummy/package.nix
+3 -3
View File
@@ -34,9 +34,9 @@ let
FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc"
FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc"
${lib.optionalString unfreeFonts ''
FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi"
FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi"
FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi"
FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi"
FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi"
FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi"
''}
EndSection