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

xorg: font utilities should be nativeBuildInputs

Browse source 
They provide programs executed by the builder.
This commit is contained in:
Will Dietz 2019-03-18 23:02:09 -05:00
parent 9e39ab6753
commit 108ab954ed
2 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,8 +78,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -92,8 +92,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -106,8 +106,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -120,8 +120,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -134,8 +134,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -161,8 +161,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -175,8 +175,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -189,8 +189,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -203,8 +203,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -217,8 +217,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -231,8 +231,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -245,8 +245,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -259,8 +259,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -273,8 +273,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -287,8 +287,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -301,8 +301,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -315,8 +315,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -329,8 +329,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -343,8 +343,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -357,8 +357,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -371,8 +371,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -385,8 +385,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -399,8 +399,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -413,8 +413,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -427,8 +427,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -441,8 +441,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -455,8 +455,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -469,8 +469,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -483,8 +483,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf fontutil mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -497,8 +497,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -511,8 +511,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -525,8 +525,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -565,8 +565,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bdftopcf mkfontscale ];
nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@ -579,8 +579,8 @@ lib.makeScope newScope (self: with self; {
sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mkfontscale ];
nativeBuildInputs = [ pkgconfig mkfontscale ];
buildInputs = [ ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

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

@ -150,15 +150,15 @@ while (<>) {
}
if ($file =~ /AC_PATH_PROG\(BDFTOPCF/) {
push @requires, "bdftopcf";
push @nativeRequires, "bdftopcf";
}
if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) {
push @requires, "mkfontscale";
push @nativeRequires, "mkfontscale";
}
if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) {
push @requires, "mkfontscale";
push @nativeRequires, "mkfontscale";
}
if ($file =~ /AM_PATH_PYTHON/) {
@ -174,17 +174,17 @@ while (<>) {
my $isFont;
if ($file =~ /XORG_FONT_BDF_UTILS/) {
push @requires, "bdftopcf", "mkfontscale";
push @nativeRequires, "bdftopcf", "mkfontscale";
$isFont = 1;
}
if ($file =~ /XORG_FONT_SCALED_UTILS/) {
push @requires, "mkfontscale";
push @nativeRequires, "mkfontscale";
$isFont = 1;
}
if ($file =~ /XORG_FONT_UCS2ANY/) {
push @requires, "fontutil", "mkfontscale";
push @nativeRequires, "fontutil", "mkfontscale";
$isFont = 1;
}