mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
console-setup: make work with upstream unifont structure
This commit is contained in:
@@ -26,6 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
bdfresize
|
||||
otf2bdf
|
||||
perl
|
||||
unifont
|
||||
];
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
@@ -35,8 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace Fonts/Makefile --replace-fail '/usr/share/fonts/truetype/dejavu/' '${dejavu_fonts}/share/fonts/truetype/'
|
||||
ln -s ${unifont}/share/fonts/unifont.bdf Fonts/bdf
|
||||
substituteInPlace Fonts/Makefile --replace-fail 'rm -f $(fntdir)/bdf/unifont.bdf' ""
|
||||
substituteInPlace Fonts/Makefile --replace-fail '/usr/share/unifont/' '${unifont.doc}/share/unifont/'
|
||||
'';
|
||||
|
||||
preBuild = "make -j$NIX_BUILD_CORES bdf";
|
||||
|
||||
Reference in New Issue
Block a user