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

xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir

Browse Source 
See:
https://lists.x.org/archives/xorg-announce/2019-March/002960.html
This commit is contained in:
Will Dietz 2019-03-18 20:14:39 -05:00
parent 542908cc35
commit 0e44d14dff
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -26,7 +26,7 @@ my %pcMap;
my %extraAttrs;
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
$pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng";
@ -157,7 +157,7 @@ while (<>) {
}
if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) {
push @requires, "mkfontdir";
push @requires, "mkfontscale";
}
if ($file =~ /AM_PATH_PYTHON/) {
@ -173,12 +173,12 @@ while (<>) {
my $isFont;
if ($file =~ /XORG_FONT_BDF_UTILS/) {
push @requires, "bdftopcf", "mkfontdir";
push @requires, "bdftopcf", "mkfontscale";
$isFont = 1;
}
if ($file =~ /XORG_FONT_SCALED_UTILS/) {
push @requires, "mkfontscale", "mkfontdir";
push @requires, "mkfontscale";
$isFont = 1;
}

6
pkgs/servers/x11/xorg/overrides.nix
View File

@ -75,8 +75,10 @@ self: super:
inherit tradcpp;
});
mkfontdir = super.mkfontdir.overrideAttrs (attrs: {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin";
mkfontdir = self.mkfontscale;
mkfontscale = super.mkfontscale.overrideAttrs (attrs: {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${placeholder "out"}/bin";
});
libxcb = super.libxcb.overrideAttrs (attrs: {