alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xorg: detect if XORG_FONT_REQUIRED_PROG(MKFONTSCALE in generate-expr-from-tarballs

Browse source
This commit is contained in:
Artturin 2022-11-07 00:50:42 +02:00
parent 4c65406f57
commit d6a9e82668
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/x11/xorg/default.nix
View file

@ -70,7 +70,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation {
encodings = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation {
pname = "encodings";
version = "1.0.5";
builder = ./builder.sh;
@ -80,7 +80,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config mkfontscale ];
buildInputs = [ ];
meta.platforms = lib.platforms.unix;
}) {};

2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View file

@ -154,7 +154,7 @@ while (<>) {
push @nativeRequires, "bdftopcf";
}
if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) {
if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/ || $file =~ /XORG_FONT_REQUIRED_PROG\(MKFONTSCALE/) {
push @nativeRequires, "mkfontscale";
}

4
pkgs/servers/x11/xorg/overrides.nix
View file

@ -41,10 +41,6 @@ self: super:
'';
});
encodings = super.encodings.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.mkfontscale ];
});
editres = super.editres.overrideAttrs (attrs: {
hardeningDisable = [ "format" ];
});