@@ -70,7 +70,7 @@ lib.makeScope newScope (self: with self; {
7070 meta.platforms = stdenv.lib.platforms.unix;
7171 }) {};
7272
73− fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
73+ fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
7474 name = "font-adobe-100dpi-1.0.3";
7575 builder = ./builder.sh;
7676 src = fetchurl {
@@ -78,13 +78,13 @@ lib.makeScope newScope (self: with self; {
7878 sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
7979 };
8080 hardeningDisable = [ "bindnow" "relro" ];
81− nativeBuildInputs = [ pkgconfig ];
82− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
81+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
82+ buildInputs = [ ];
8383 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
8484 meta.platforms = stdenv.lib.platforms.unix;
8585 }) {};
8686
87− fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
87+ fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
8888 name = "font-adobe-75dpi-1.0.3";
8989 builder = ./builder.sh;
9090 src = fetchurl {
@@ -92,13 +92,13 @@ lib.makeScope newScope (self: with self; {
9292 sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
9393 };
9494 hardeningDisable = [ "bindnow" "relro" ];
95− nativeBuildInputs = [ pkgconfig ];
96− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
95+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
96+ buildInputs = [ ];
9797 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
9898 meta.platforms = stdenv.lib.platforms.unix;
9999 }) {};
100100
101− fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
101+ fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
102102 name = "font-adobe-utopia-100dpi-1.0.4";
103103 builder = ./builder.sh;
104104 src = fetchurl {
@@ -106,13 +106,13 @@ lib.makeScope newScope (self: with self; {
106106 sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
107107 };
108108 hardeningDisable = [ "bindnow" "relro" ];
109− nativeBuildInputs = [ pkgconfig ];
110− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
109+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
110+ buildInputs = [ ];
111111 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
112112 meta.platforms = stdenv.lib.platforms.unix;
113113 }) {};
114114
115− fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
115+ fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
116116 name = "font-adobe-utopia-75dpi-1.0.4";
117117 builder = ./builder.sh;
118118 src = fetchurl {
@@ -120,13 +120,13 @@ lib.makeScope newScope (self: with self; {
120120 sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
121121 };
122122 hardeningDisable = [ "bindnow" "relro" ];
123− nativeBuildInputs = [ pkgconfig ];
124− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
123+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
124+ buildInputs = [ ];
125125 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
126126 meta.platforms = stdenv.lib.platforms.unix;
127127 }) {};
128128
129− fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
129+ fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
130130 name = "font-adobe-utopia-type1-1.0.4";
131131 builder = ./builder.sh;
132132 src = fetchurl {
@@ -134,8 +134,8 @@ lib.makeScope newScope (self: with self; {
134134 sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
135135 };
136136 hardeningDisable = [ "bindnow" "relro" ];
137− nativeBuildInputs = [ pkgconfig ];
138− buildInputs = [ mkfontdir mkfontscale ];
137+ nativeBuildInputs = [ pkgconfig mkfontscale ];
138+ buildInputs = [ ];
139139 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
140140 meta.platforms = stdenv.lib.platforms.unix;
141141 }) {};
@@ -153,7 +153,7 @@ lib.makeScope newScope (self: with self; {
153153 meta.platforms = stdenv.lib.platforms.unix;
154154 }) {};
155155
156− fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
156+ fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
157157 name = "font-arabic-misc-1.0.3";
158158 builder = ./builder.sh;
159159 src = fetchurl {
@@ -161,13 +161,13 @@ lib.makeScope newScope (self: with self; {
161161 sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
162162 };
163163 hardeningDisable = [ "bindnow" "relro" ];
164− nativeBuildInputs = [ pkgconfig ];
165− buildInputs = [ bdftopcf mkfontdir ];
164+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
165+ buildInputs = [ ];
166166 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
167167 meta.platforms = stdenv.lib.platforms.unix;
168168 }) {};
169169
170− fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
170+ fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
171171 name = "font-bh-100dpi-1.0.3";
172172 builder = ./builder.sh;
173173 src = fetchurl {
@@ -175,13 +175,13 @@ lib.makeScope newScope (self: with self; {
175175 sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
176176 };
177177 hardeningDisable = [ "bindnow" "relro" ];
178− nativeBuildInputs = [ pkgconfig ];
179− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
178+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
179+ buildInputs = [ ];
180180 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
181181 meta.platforms = stdenv.lib.platforms.unix;
182182 }) {};
183183
184− fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
184+ fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
185185 name = "font-bh-75dpi-1.0.3";
186186 builder = ./builder.sh;
187187 src = fetchurl {
@@ -189,13 +189,13 @@ lib.makeScope newScope (self: with self; {
189189 sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
190190 };
191191 hardeningDisable = [ "bindnow" "relro" ];
192− nativeBuildInputs = [ pkgconfig ];
193− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
192+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
193+ buildInputs = [ ];
194194 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
195195 meta.platforms = stdenv.lib.platforms.unix;
196196 }) {};
197197
198− fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
198+ fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
199199 name = "font-bh-lucidatypewriter-100dpi-1.0.3";
200200 builder = ./builder.sh;
201201 src = fetchurl {
@@ -203,13 +203,13 @@ lib.makeScope newScope (self: with self; {
203203 sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
204204 };
205205 hardeningDisable = [ "bindnow" "relro" ];
206− nativeBuildInputs = [ pkgconfig ];
207− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
206+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
207+ buildInputs = [ ];
208208 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
209209 meta.platforms = stdenv.lib.platforms.unix;
210210 }) {};
211211
212− fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
212+ fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
213213 name = "font-bh-lucidatypewriter-75dpi-1.0.3";
214214 builder = ./builder.sh;
215215 src = fetchurl {
@@ -217,13 +217,13 @@ lib.makeScope newScope (self: with self; {
217217 sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
218218 };
219219 hardeningDisable = [ "bindnow" "relro" ];
220− nativeBuildInputs = [ pkgconfig ];
221− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
220+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
221+ buildInputs = [ ];
222222 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
223223 meta.platforms = stdenv.lib.platforms.unix;
224224 }) {};
225225
226− fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
226+ fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
227227 name = "font-bh-ttf-1.0.3";
228228 builder = ./builder.sh;
229229 src = fetchurl {
@@ -231,13 +231,13 @@ lib.makeScope newScope (self: with self; {
231231 sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
232232 };
233233 hardeningDisable = [ "bindnow" "relro" ];
234− nativeBuildInputs = [ pkgconfig ];
235− buildInputs = [ mkfontdir mkfontscale ];
234+ nativeBuildInputs = [ pkgconfig mkfontscale ];
235+ buildInputs = [ ];
236236 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
237237 meta.platforms = stdenv.lib.platforms.unix;
238238 }) {};
239239
240− fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
240+ fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
241241 name = "font-bh-type1-1.0.3";
242242 builder = ./builder.sh;
243243 src = fetchurl {
@@ -245,13 +245,13 @@ lib.makeScope newScope (self: with self; {
245245 sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
246246 };
247247 hardeningDisable = [ "bindnow" "relro" ];
248− nativeBuildInputs = [ pkgconfig ];
249− buildInputs = [ mkfontdir mkfontscale ];
248+ nativeBuildInputs = [ pkgconfig mkfontscale ];
249+ buildInputs = [ ];
250250 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
251251 meta.platforms = stdenv.lib.platforms.unix;
252252 }) {};
253253
254− fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
254+ fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
255255 name = "font-bitstream-100dpi-1.0.3";
256256 builder = ./builder.sh;
257257 src = fetchurl {
@@ -259,13 +259,13 @@ lib.makeScope newScope (self: with self; {
259259 sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
260260 };
261261 hardeningDisable = [ "bindnow" "relro" ];
262− nativeBuildInputs = [ pkgconfig ];
263− buildInputs = [ bdftopcf mkfontdir ];
262+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
263+ buildInputs = [ ];
264264 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
265265 meta.platforms = stdenv.lib.platforms.unix;
266266 }) {};
267267
268− fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
268+ fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
269269 name = "font-bitstream-75dpi-1.0.3";
270270 builder = ./builder.sh;
271271 src = fetchurl {
@@ -273,13 +273,13 @@ lib.makeScope newScope (self: with self; {
273273 sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
274274 };
275275 hardeningDisable = [ "bindnow" "relro" ];
276− nativeBuildInputs = [ pkgconfig ];
277− buildInputs = [ bdftopcf mkfontdir ];
276+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
277+ buildInputs = [ ];
278278 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
279279 meta.platforms = stdenv.lib.platforms.unix;
280280 }) {};
281281
282− fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
282+ fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
283283 name = "font-bitstream-type1-1.0.3";
284284 builder = ./builder.sh;
285285 src = fetchurl {
@@ -287,13 +287,13 @@ lib.makeScope newScope (self: with self; {
287287 sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
288288 };
289289 hardeningDisable = [ "bindnow" "relro" ];
290− nativeBuildInputs = [ pkgconfig ];
291− buildInputs = [ mkfontdir mkfontscale ];
290+ nativeBuildInputs = [ pkgconfig mkfontscale ];
291+ buildInputs = [ ];
292292 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
293293 meta.platforms = stdenv.lib.platforms.unix;
294294 }) {};
295295
296− fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
296+ fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
297297 name = "font-cronyx-cyrillic-1.0.3";
298298 builder = ./builder.sh;
299299 src = fetchurl {
@@ -301,13 +301,13 @@ lib.makeScope newScope (self: with self; {
301301 sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
302302 };
303303 hardeningDisable = [ "bindnow" "relro" ];
304− nativeBuildInputs = [ pkgconfig ];
305− buildInputs = [ bdftopcf mkfontdir ];
304+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
305+ buildInputs = [ ];
306306 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
307307 meta.platforms = stdenv.lib.platforms.unix;
308308 }) {};
309309
310− fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
310+ fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
311311 name = "font-cursor-misc-1.0.3";
312312 builder = ./builder.sh;
313313 src = fetchurl {
@@ -315,13 +315,13 @@ lib.makeScope newScope (self: with self; {
315315 sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
316316 };
317317 hardeningDisable = [ "bindnow" "relro" ];
318− nativeBuildInputs = [ pkgconfig ];
319− buildInputs = [ bdftopcf mkfontdir ];
318+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
319+ buildInputs = [ ];
320320 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
321321 meta.platforms = stdenv.lib.platforms.unix;
322322 }) {};
323323
324− fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
324+ fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
325325 name = "font-daewoo-misc-1.0.3";
326326 builder = ./builder.sh;
327327 src = fetchurl {
@@ -329,13 +329,13 @@ lib.makeScope newScope (self: with self; {
329329 sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
330330 };
331331 hardeningDisable = [ "bindnow" "relro" ];
332− nativeBuildInputs = [ pkgconfig ];
333− buildInputs = [ bdftopcf mkfontdir ];
332+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
333+ buildInputs = [ ];
334334 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
335335 meta.platforms = stdenv.lib.platforms.unix;
336336 }) {};
337337
338− fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
338+ fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
339339 name = "font-dec-misc-1.0.3";
340340 builder = ./builder.sh;
341341 src = fetchurl {
@@ -343,13 +343,13 @@ lib.makeScope newScope (self: with self; {
343343 sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
344344 };
345345 hardeningDisable = [ "bindnow" "relro" ];
346− nativeBuildInputs = [ pkgconfig ];
347− buildInputs = [ bdftopcf mkfontdir ];
346+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
347+ buildInputs = [ ];
348348 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
349349 meta.platforms = stdenv.lib.platforms.unix;
350350 }) {};
351351
352− fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
352+ fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
353353 name = "font-ibm-type1-1.0.3";
354354 builder = ./builder.sh;
355355 src = fetchurl {
@@ -357,13 +357,13 @@ lib.makeScope newScope (self: with self; {
357357 sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
358358 };
359359 hardeningDisable = [ "bindnow" "relro" ];
360− nativeBuildInputs = [ pkgconfig ];
361− buildInputs = [ mkfontdir mkfontscale ];
360+ nativeBuildInputs = [ pkgconfig mkfontscale ];
361+ buildInputs = [ ];
362362 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
363363 meta.platforms = stdenv.lib.platforms.unix;
364364 }) {};
365365
366− fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
366+ fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
367367 name = "font-isas-misc-1.0.3";
368368 builder = ./builder.sh;
369369 src = fetchurl {
@@ -371,13 +371,13 @@ lib.makeScope newScope (self: with self; {
371371 sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
372372 };
373373 hardeningDisable = [ "bindnow" "relro" ];
374− nativeBuildInputs = [ pkgconfig ];
375− buildInputs = [ bdftopcf mkfontdir ];
374+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
375+ buildInputs = [ ];
376376 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
377377 meta.platforms = stdenv.lib.platforms.unix;
378378 }) {};
379379
380− fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
380+ fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
381381 name = "font-jis-misc-1.0.3";
382382 builder = ./builder.sh;
383383 src = fetchurl {
@@ -385,13 +385,13 @@ lib.makeScope newScope (self: with self; {
385385 sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
386386 };
387387 hardeningDisable = [ "bindnow" "relro" ];
388− nativeBuildInputs = [ pkgconfig ];
389− buildInputs = [ bdftopcf mkfontdir ];
388+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
389+ buildInputs = [ ];
390390 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
391391 meta.platforms = stdenv.lib.platforms.unix;
392392 }) {};
393393
394− fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
394+ fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
395395 name = "font-micro-misc-1.0.3";
396396 builder = ./builder.sh;
397397 src = fetchurl {
@@ -399,13 +399,13 @@ lib.makeScope newScope (self: with self; {
399399 sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
400400 };
401401 hardeningDisable = [ "bindnow" "relro" ];
402− nativeBuildInputs = [ pkgconfig ];
403− buildInputs = [ bdftopcf mkfontdir ];
402+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
403+ buildInputs = [ ];
404404 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
405405 meta.platforms = stdenv.lib.platforms.unix;
406406 }) {};
407407
408− fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
408+ fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
409409 name = "font-misc-cyrillic-1.0.3";
410410 builder = ./builder.sh;
411411 src = fetchurl {
@@ -413,13 +413,13 @@ lib.makeScope newScope (self: with self; {
413413 sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
414414 };
415415 hardeningDisable = [ "bindnow" "relro" ];
416− nativeBuildInputs = [ pkgconfig ];
417− buildInputs = [ bdftopcf mkfontdir ];
416+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
417+ buildInputs = [ ];
418418 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
419419 meta.platforms = stdenv.lib.platforms.unix;
420420 }) {};
421421
422− fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
422+ fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
423423 name = "font-misc-ethiopic-1.0.3";
424424 builder = ./builder.sh;
425425 src = fetchurl {
@@ -427,13 +427,13 @@ lib.makeScope newScope (self: with self; {
427427 sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
428428 };
429429 hardeningDisable = [ "bindnow" "relro" ];
430− nativeBuildInputs = [ pkgconfig ];
431− buildInputs = [ mkfontdir mkfontscale ];
430+ nativeBuildInputs = [ pkgconfig mkfontscale ];
431+ buildInputs = [ ];
432432 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
433433 meta.platforms = stdenv.lib.platforms.unix;
434434 }) {};
435435
436− fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
436+ fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
437437 name = "font-misc-meltho-1.0.3";
438438 builder = ./builder.sh;
439439 src = fetchurl {
@@ -441,13 +441,13 @@ lib.makeScope newScope (self: with self; {
441441 sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
442442 };
443443 hardeningDisable = [ "bindnow" "relro" ];
444− nativeBuildInputs = [ pkgconfig ];
445− buildInputs = [ mkfontdir mkfontscale ];
444+ nativeBuildInputs = [ pkgconfig mkfontscale ];
445+ buildInputs = [ ];
446446 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
447447 meta.platforms = stdenv.lib.platforms.unix;
448448 }) {};
449449
450− fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
450+ fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
451451 name = "font-misc-misc-1.1.2";
452452 builder = ./builder.sh;
453453 src = fetchurl {
@@ -455,13 +455,13 @@ lib.makeScope newScope (self: with self; {
455455 sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
456456 };
457457 hardeningDisable = [ "bindnow" "relro" ];
458− nativeBuildInputs = [ pkgconfig ];
459− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
458+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
459+ buildInputs = [ ];
460460 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
461461 meta.platforms = stdenv.lib.platforms.unix;
462462 }) {};
463463
464− fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
464+ fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
465465 name = "font-mutt-misc-1.0.3";
466466 builder = ./builder.sh;
467467 src = fetchurl {
@@ -469,13 +469,13 @@ lib.makeScope newScope (self: with self; {
469469 sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
470470 };
471471 hardeningDisable = [ "bindnow" "relro" ];
472− nativeBuildInputs = [ pkgconfig ];
473− buildInputs = [ bdftopcf mkfontdir ];
472+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
473+ buildInputs = [ ];
474474 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
475475 meta.platforms = stdenv.lib.platforms.unix;
476476 }) {};
477477
478− fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
478+ fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
479479 name = "font-schumacher-misc-1.1.2";
480480 builder = ./builder.sh;
481481 src = fetchurl {
@@ -483,13 +483,13 @@ lib.makeScope newScope (self: with self; {
483483 sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
484484 };
485485 hardeningDisable = [ "bindnow" "relro" ];
486− nativeBuildInputs = [ pkgconfig ];
487− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
486+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
487+ buildInputs = [ ];
488488 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
489489 meta.platforms = stdenv.lib.platforms.unix;
490490 }) {};
491491
492− fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
492+ fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
493493 name = "font-screen-cyrillic-1.0.4";
494494 builder = ./builder.sh;
495495 src = fetchurl {
@@ -497,13 +497,13 @@ lib.makeScope newScope (self: with self; {
497497 sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
498498 };
499499 hardeningDisable = [ "bindnow" "relro" ];
500− nativeBuildInputs = [ pkgconfig ];
501− buildInputs = [ bdftopcf mkfontdir ];
500+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
501+ buildInputs = [ ];
502502 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
503503 meta.platforms = stdenv.lib.platforms.unix;
504504 }) {};
505505
506− fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
506+ fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
507507 name = "font-sony-misc-1.0.3";
508508 builder = ./builder.sh;
509509 src = fetchurl {
@@ -511,13 +511,13 @@ lib.makeScope newScope (self: with self; {
511511 sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
512512 };
513513 hardeningDisable = [ "bindnow" "relro" ];
514− nativeBuildInputs = [ pkgconfig ];
515− buildInputs = [ bdftopcf mkfontdir ];
514+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
515+ buildInputs = [ ];
516516 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
517517 meta.platforms = stdenv.lib.platforms.unix;
518518 }) {};
519519
520− fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
520+ fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
521521 name = "font-sun-misc-1.0.3";
522522 builder = ./builder.sh;
523523 src = fetchurl {
@@ -525,8 +525,8 @@ lib.makeScope newScope (self: with self; {
525525 sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
526526 };
527527 hardeningDisable = [ "bindnow" "relro" ];
528− nativeBuildInputs = [ pkgconfig ];
529− buildInputs = [ bdftopcf mkfontdir ];
528+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
529+ buildInputs = [ ];
530530 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
531531 meta.platforms = stdenv.lib.platforms.unix;
532532 }) {};
@@ -557,7 +557,7 @@ lib.makeScope newScope (self: with self; {
557557 meta.platforms = stdenv.lib.platforms.unix;
558558 }) {};
559559
560− fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
560+ fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
561561 name = "font-winitzki-cyrillic-1.0.3";
562562 builder = ./builder.sh;
563563 src = fetchurl {
@@ -565,13 +565,13 @@ lib.makeScope newScope (self: with self; {
565565 sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
566566 };
567567 hardeningDisable = [ "bindnow" "relro" ];
568− nativeBuildInputs = [ pkgconfig ];
569− buildInputs = [ bdftopcf mkfontdir ];
568+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
569+ buildInputs = [ ];
570570 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
571571 meta.platforms = stdenv.lib.platforms.unix;
572572 }) {};
573573
574− fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
574+ fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
575575 name = "font-xfree86-type1-1.0.4";
576576 builder = ./builder.sh;
577577 src = fetchurl {
@@ -579,8 +579,8 @@ lib.makeScope newScope (self: with self; {
579579 sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
580580 };
581581 hardeningDisable = [ "bindnow" "relro" ];
582− nativeBuildInputs = [ pkgconfig ];
583− buildInputs = [ mkfontdir mkfontscale ];
582+ nativeBuildInputs = [ pkgconfig mkfontscale ];
583+ buildInputs = [ ];
584584 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
585585 meta.platforms = stdenv.lib.platforms.unix;
586586 }) {};
@@ -625,11 +625,11 @@ lib.makeScope newScope (self: with self; {
625625 }) {};
626626
627627 imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
628− name = "imake-1.0.7";
628+ name = "imake-1.0.8";
629629 builder = ./builder.sh;
630630 src = fetchurl {
631− url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2;
632− sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
631+ url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2;
632+ sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq";
633633 };
634634 hardeningDisable = [ "bindnow" "relro" ];
635635 nativeBuildInputs = [ pkgconfig ];
@@ -651,11 +651,11 @@ lib.makeScope newScope (self: with self; {
651651 }) {};
652652
653653 libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation {
654− name = "libFS-1.0.7";
654+ name = "libFS-1.0.8";
655655 builder = ./builder.sh;
656656 src = fetchurl {
657− url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2;
658− sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f";
657+ url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2;
658+ sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8";
659659 };
660660 hardeningDisable = [ "bindnow" "relro" ];
661661 nativeBuildInputs = [ pkgconfig ];
@@ -768,11 +768,11 @@ lib.makeScope newScope (self: with self; {
768768 }) {};
769769
770770 libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation {
771− name = "libXcomposite-0.4.4";
771+ name = "libXcomposite-0.4.5";
772772 builder = ./builder.sh;
773773 src = fetchurl {
774− url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2;
775− sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
774+ url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2;
775+ sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk";
776776 };
777777 hardeningDisable = [ "bindnow" "relro" ];
778778 nativeBuildInputs = [ pkgconfig ];
@@ -781,11 +781,11 @@ lib.makeScope newScope (self: with self; {
781781 }) {};
782782
783783 libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation {
784− name = "libXcursor-1.1.15";
784+ name = "libXcursor-1.2.0";
785785 builder = ./builder.sh;
786786 src = fetchurl {
787− url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2;
788− sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9";
787+ url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2;
788+ sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs";
789789 };
790790 hardeningDisable = [ "bindnow" "relro" ];
791791 nativeBuildInputs = [ pkgconfig ];
@@ -794,11 +794,11 @@ lib.makeScope newScope (self: with self; {
794794 }) {};
795795
796796 libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation {
797− name = "libXdamage-1.1.4";
797+ name = "libXdamage-1.1.5";
798798 builder = ./builder.sh;
799799 src = fetchurl {
800− url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2;
801− sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
800+ url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2;
801+ sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p";
802802 };
803803 hardeningDisable = [ "bindnow" "relro" ];
804804 nativeBuildInputs = [ pkgconfig ];
@@ -807,11 +807,11 @@ lib.makeScope newScope (self: with self; {
807807 }) {};
808808
809809 libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
810− name = "libXdmcp-1.1.2";
810+ name = "libXdmcp-1.1.3";
811811 builder = ./builder.sh;
812812 src = fetchurl {
813− url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2;
814− sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1";
813+ url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2;
814+ sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0";
815815 };
816816 hardeningDisable = [ "bindnow" "relro" ];
817817 nativeBuildInputs = [ pkgconfig ];
@@ -820,11 +820,11 @@ lib.makeScope newScope (self: with self; {
820820 }) {};
821821
822822 libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
823− name = "libXext-1.3.3";
823+ name = "libXext-1.3.4";
824824 builder = ./builder.sh;
825825 src = fetchurl {
826− url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2;
827− sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
826+ url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2;
827+ sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar";
828828 };
829829 hardeningDisable = [ "bindnow" "relro" ];
830830 nativeBuildInputs = [ pkgconfig ];
@@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; {
872872 }) {};
873873
874874 libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation {
875− name = "libXft-2.3.2";
875+ name = "libXft-2.3.3";
876876 builder = ./builder.sh;
877877 src = fetchurl {
878− url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
879− sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
878+ url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2;
879+ sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12";
880880 };
881881 hardeningDisable = [ "bindnow" "relro" ];
882882 nativeBuildInputs = [ pkgconfig ];
@@ -911,11 +911,11 @@ lib.makeScope newScope (self: with self; {
911911 }) {};
912912
913913 libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation {
914− name = "libXmu-1.1.2";
914+ name = "libXmu-1.1.3";
915915 builder = ./builder.sh;
916916 src = fetchurl {
917− url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2;
918− sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
917+ url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2;
918+ sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w";
919919 };
920920 hardeningDisable = [ "bindnow" "relro" ];
921921 nativeBuildInputs = [ pkgconfig ];
@@ -936,7 +936,7 @@ lib.makeScope newScope (self: with self; {
936936 meta.platforms = stdenv.lib.platforms.unix;
937937 }) {};
938938
939− libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation {
939+ libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation {
940940 name = "libXpm-3.5.12";
941941 builder = ./builder.sh;
942942 src = fetchurl {
@@ -944,7 +944,7 @@ lib.makeScope newScope (self: with self; {
944944 sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
945945 };
946946 hardeningDisable = [ "bindnow" "relro" ];
947− nativeBuildInputs = [ pkgconfig ];
947+ nativeBuildInputs = [ pkgconfig gettext ];
948948 buildInputs = [ libX11 libXext xorgproto libXt ];
949949 meta.platforms = stdenv.lib.platforms.unix;
950950 }) {};
@@ -963,11 +963,11 @@ lib.makeScope newScope (self: with self; {
963963 }) {};
964964
965965 libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation {
966− name = "libXrandr-1.5.1";
966+ name = "libXrandr-1.5.2";
967967 builder = ./builder.sh;
968968 src = fetchurl {
969− url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2;
970− sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z";
969+ url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2;
970+ sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla";
971971 };
972972 hardeningDisable = [ "bindnow" "relro" ];
973973 nativeBuildInputs = [ pkgconfig ];
@@ -1041,11 +1041,11 @@ lib.makeScope newScope (self: with self; {
10411041 }) {};
10421042
10431043 libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation {
1044− name = "libXvMC-1.0.10";
1044+ name = "libXvMC-1.0.11";
10451045 builder = ./builder.sh;
10461046 src = fetchurl {
1047− url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2;
1048− sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5";
1047+ url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2;
1048+ sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
10491049 };
10501050 hardeningDisable = [ "bindnow" "relro" ];
10511051 nativeBuildInputs = [ pkgconfig ];
@@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; {
10541054 }) {};
10551055
10561056 libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation {
1057− name = "libXxf86dga-1.1.4";
1057+ name = "libXxf86dga-1.1.5";
10581058 builder = ./builder.sh;
10591059 src = fetchurl {
1060− url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2;
1061− sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
1060+ url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2;
1061+ sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b";
10621062 };
10631063 hardeningDisable = [ "bindnow" "relro" ];
10641064 nativeBuildInputs = [ pkgconfig ];
@@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; {
11581158 }) {};
11591159
11601160 libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {
1161− name = "libxkbfile-1.0.9";
1161+ name = "libxkbfile-1.1.0";
11621162 builder = ./builder.sh;
11631163 src = fetchurl {
1164− url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2;
1165− sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai";
1164+ url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2;
1165+ sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm";
11661166 };
11671167 hardeningDisable = [ "bindnow" "relro" ];
11681168 nativeBuildInputs = [ pkgconfig ];
@@ -1210,11 +1210,11 @@ lib.makeScope newScope (self: with self; {
12101210 }) {};
12111211
12121212 luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
1213− name = "luit-20181211";
1213+ name = "luit-20190106";
12141214 builder = ./builder.sh;
12151215 src = fetchurl {
1216− url = ftp://ftp.invisible-island.net/luit/luit-20181211.tgz;
1217− sha256 = "18mf3savxjs29hf4xhhc5h278qy0bbj9ddssx44w0bnlg107jhp1";
1216+ url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz;
1217+ sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b";
12181218 };
12191219 hardeningDisable = [ "bindnow" "relro" ];
12201220 nativeBuildInputs = [ pkgconfig ];
@@ -1223,11 +1223,11 @@ lib.makeScope newScope (self: with self; {
12231223 }) {};
12241224
12251225 makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
1226− name = "makedepend-1.0.5";
1226+ name = "makedepend-1.0.6";
12271227 builder = ./builder.sh;
12281228 src = fetchurl {
1229− url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2;
1230− sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
1229+ url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2;
1230+ sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m";
12311231 };
12321232 hardeningDisable = [ "bindnow" "relro" ];
12331233 nativeBuildInputs = [ pkgconfig ];
@@ -1235,25 +1235,12 @@ lib.makeScope newScope (self: with self; {
12351235 meta.platforms = stdenv.lib.platforms.unix;
12361236 }) {};
12371237
1238− mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
1239− name = "mkfontdir-1.0.7";
1240− builder = ./builder.sh;
1241− src = fetchurl {
1242− url = mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2;
1243− sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
1244− };
1245− hardeningDisable = [ "bindnow" "relro" ];
1246− nativeBuildInputs = [ pkgconfig ];
1247− buildInputs = [ ];
1248− meta.platforms = stdenv.lib.platforms.unix;
1249− }) {};
1250−
12511238 mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation {
1252− name = "mkfontscale-1.1.3";
1239+ name = "mkfontscale-1.2.1";
12531240 builder = ./builder.sh;
12541241 src = fetchurl {
1255− url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2;
1256− sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y";
1242+ url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2;
1243+ sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a";
12571244 };
12581245 hardeningDisable = [ "bindnow" "relro" ];
12591246 nativeBuildInputs = [ pkgconfig ];
@@ -1261,7 +1248,7 @@ lib.makeScope newScope (self: with self; {
12611248 meta.platforms = stdenv.lib.platforms.unix;
12621249 }) {};
12631250
1264− oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
1251+ oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
12651252 name = "oclock-1.0.4";
12661253 builder = ./builder.sh;
12671254 src = fetchurl {
@@ -1270,7 +1257,7 @@ lib.makeScope newScope (self: with self; {
12701257 };
12711258 hardeningDisable = [ "bindnow" "relro" ];
12721259 nativeBuildInputs = [ pkgconfig ];
1273− buildInputs = [ libX11 libXext libXmu libXt ];
1260+ buildInputs = [ libxkbfile libX11 libXext libXmu libXt ];
12741261 meta.platforms = stdenv.lib.platforms.unix;
12751262 }) {};
12761263
@@ -1366,11 +1353,11 @@ lib.makeScope newScope (self: with self; {
13661353 }) {};
13671354
13681355 x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation {
1369− name = "x11perf-1.6.0";
1356+ name = "x11perf-1.6.1";
13701357 builder = ./builder.sh;
13711358 src = fetchurl {
1372− url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2;
1373− sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78";
1359+ url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2;
1360+ sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw";
13741361 };
13751362 hardeningDisable = [ "bindnow" "relro" ];
13761363 nativeBuildInputs = [ pkgconfig ];
@@ -1443,7 +1430,7 @@ lib.makeScope newScope (self: with self; {
14431430 meta.platforms = stdenv.lib.platforms.unix;
14441431 }) {};
14451432
1446− xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation {
1433+ xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
14471434 name = "xcb-util-0.4.0";
14481435 builder = ./builder.sh;
14491436 src = fetchurl {
@@ -1452,11 +1439,11 @@ lib.makeScope newScope (self: with self; {
14521439 };
14531440 hardeningDisable = [ "bindnow" "relro" ];
14541441 nativeBuildInputs = [ pkgconfig ];
1455− buildInputs = [ gperf m4 libxcb ];
1442+ buildInputs = [ gperf m4 libxcb xorgproto ];
14561443 meta.platforms = stdenv.lib.platforms.unix;
14571444 }) {};
14581445
1459− xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil }: stdenv.mkDerivation {
1446+ xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation {
14601447 name = "xcb-util-cursor-0.1.3";
14611448 builder = ./builder.sh;
14621449 src = fetchurl {
@@ -1465,11 +1452,11 @@ lib.makeScope newScope (self: with self; {
14651452 };
14661453 hardeningDisable = [ "bindnow" "relro" ];
14671454 nativeBuildInputs = [ pkgconfig ];
1468− buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil ];
1455+ buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ];
14691456 meta.platforms = stdenv.lib.platforms.unix;
14701457 }) {};
14711458
1472− xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto }: stdenv.mkDerivation {
1459+ xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation {
14731460 name = "xcb-util-errors-1.0";
14741461 builder = ./builder.sh;
14751462 src = fetchurl {
@@ -1478,7 +1465,7 @@ lib.makeScope newScope (self: with self; {
14781465 };
14791466 hardeningDisable = [ "bindnow" "relro" ];
14801467 nativeBuildInputs = [ pkgconfig ];
1481− buildInputs = [ gperf m4 libxcb xcbproto ];
1468+ buildInputs = [ gperf m4 libxcb xcbproto xorgproto ];
14821469 meta.platforms = stdenv.lib.platforms.unix;
14831470 }) {};
14841471
@@ -1508,7 +1495,7 @@ lib.makeScope newScope (self: with self; {
15081495 meta.platforms = stdenv.lib.platforms.unix;
15091496 }) {};
15101497
1511− xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation {
1498+ xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
15121499 name = "xcb-util-renderutil-0.3.9";
15131500 builder = ./builder.sh;
15141501 src = fetchurl {
@@ -1517,11 +1504,11 @@ lib.makeScope newScope (self: with self; {
15171504 };
15181505 hardeningDisable = [ "bindnow" "relro" ];
15191506 nativeBuildInputs = [ pkgconfig ];
1520− buildInputs = [ gperf m4 libxcb ];
1507+ buildInputs = [ gperf m4 libxcb xorgproto ];
15211508 meta.platforms = stdenv.lib.platforms.unix;
15221509 }) {};
15231510
1524− xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation {
1511+ xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
15251512 name = "xcb-util-wm-0.4.1";
15261513 builder = ./builder.sh;
15271514 src = fetchurl {
@@ -1530,7 +1517,7 @@ lib.makeScope newScope (self: with self; {
15301517 };
15311518 hardeningDisable = [ "bindnow" "relro" ];
15321519 nativeBuildInputs = [ pkgconfig ];
1533− buildInputs = [ gperf m4 libxcb ];
1520+ buildInputs = [ gperf m4 libxcb xorgproto ];
15341521 meta.platforms = stdenv.lib.platforms.unix;
15351522 }) {};
15361523
@@ -1561,11 +1548,11 @@ lib.makeScope newScope (self: with self; {
15611548 }) {};
15621549
15631550 xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation {
1564− name = "xcompmgr-1.1.7";
1551+ name = "xcompmgr-1.1.8";
15651552 builder = ./builder.sh;
15661553 src = fetchurl {
1567− url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2;
1568− sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
1554+ url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2;
1555+ sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b";
15691556 };
15701557 hardeningDisable = [ "bindnow" "relro" ];
15711558 nativeBuildInputs = [ pkgconfig ];
@@ -1638,7 +1625,7 @@ lib.makeScope newScope (self: with self; {
16381625 meta.platforms = stdenv.lib.platforms.unix;
16391626 }) {};
16401627
1641− xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {
1628+ xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation {
16421629 name = "xdriinfo-1.0.6";
16431630 builder = ./builder.sh;
16441631 src = fetchurl {
@@ -1647,7 +1634,7 @@ lib.makeScope newScope (self: with self; {
16471634 };
16481635 hardeningDisable = [ "bindnow" "relro" ];
16491636 nativeBuildInputs = [ pkgconfig ];
1650− buildInputs = [ xorgproto libX11 ];
1637+ buildInputs = [ libGL xorgproto libX11 ];
16511638 meta.platforms = stdenv.lib.platforms.unix;
16521639 }) {};
16531640
@@ -1677,7 +1664,7 @@ lib.makeScope newScope (self: with self; {
16771664 meta.platforms = stdenv.lib.platforms.unix;
16781665 }) {};
16791666
1680− xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation {
1667+ xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation {
16811668 name = "xf86-input-evdev-2.10.6";
16821669 builder = ./builder.sh;
16831670 src = fetchurl {
@@ -1686,7 +1673,7 @@ lib.makeScope newScope (self: with self; {
16861673 };
16871674 hardeningDisable = [ "bindnow" "relro" ];
16881675 nativeBuildInputs = [ pkgconfig ];
1689− buildInputs = [ xorgproto udev xorgserver ];
1676+ buildInputs = [ xorgproto libevdev udev mtdev xorgserver ];
16901677 meta.platforms = stdenv.lib.platforms.unix;
16911678 }) {};
16921679
@@ -1716,7 +1703,7 @@ lib.makeScope newScope (self: with self; {
17161703 meta.platforms = stdenv.lib.platforms.unix;
17171704 }) {};
17181705
1719− xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation {
1706+ xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
17201707 name = "xf86-input-libinput-0.28.2";
17211708 builder = ./builder.sh;
17221709 src = fetchurl {
@@ -1725,7 +1712,7 @@ lib.makeScope newScope (self: with self; {
17251712 };
17261713 hardeningDisable = [ "bindnow" "relro" ];
17271714 nativeBuildInputs = [ pkgconfig ];
1728− buildInputs = [ xorgproto xorgserver ];
1715+ buildInputs = [ xorgproto libinput xorgserver ];
17291716 meta.platforms = stdenv.lib.platforms.unix;
17301717 }) {};
17311718
@@ -1742,7 +1729,7 @@ lib.makeScope newScope (self: with self; {
17421729 meta.platforms = stdenv.lib.platforms.unix;
17431730 }) {};
17441731
1745− xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation {
1732+ xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation {
17461733 name = "xf86-input-synaptics-1.9.1";
17471734 builder = ./builder.sh;
17481735 src = fetchurl {
@@ -1751,7 +1738,7 @@ lib.makeScope newScope (self: with self; {
17511738 };
17521739 hardeningDisable = [ "bindnow" "relro" ];
17531740 nativeBuildInputs = [ pkgconfig ];
1754− buildInputs = [ xorgproto libX11 libXi xorgserver libXtst ];
1741+ buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ];
17551742 meta.platforms = stdenv.lib.platforms.unix;
17561743 }) {};
17571744
@@ -1782,11 +1769,11 @@ lib.makeScope newScope (self: with self; {
17821769 }) {};
17831770
17841771 xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation {
1785− name = "xf86-video-amdgpu-18.1.0";
1772+ name = "xf86-video-amdgpu-19.0.1";
17861773 builder = ./builder.sh;
17871774 src = fetchurl {
1788− url = mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2;
1789− sha256 = "0wlnb929l3yqj4hdkzyxyhbaph13ac4villajgmbh66pa6xja7z1";
1775+ url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2;
1776+ sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da";
17901777 };
17911778 hardeningDisable = [ "bindnow" "relro" ];
17921779 nativeBuildInputs = [ pkgconfig ];
@@ -1833,16 +1820,16 @@ lib.makeScope newScope (self: with self; {
18331820 meta.platforms = stdenv.lib.platforms.unix;
18341821 }) {};
18351822
1836− xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
1837− name = "xf86-video-ati-18.0.1";
1823+ xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
1824+ name = "xf86-video-ati-19.0.1";
18381825 builder = ./builder.sh;
18391826 src = fetchurl {
1840− url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2;
1841− sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj";
1827+ url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2;
1828+ sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw";
18421829 };
18431830 hardeningDisable = [ "bindnow" "relro" ];
18441831 nativeBuildInputs = [ pkgconfig ];
1845− buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ];
1832+ buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ];
18461833 meta.platforms = stdenv.lib.platforms.unix;
18471834 }) {};
18481835
@@ -1963,7 +1950,7 @@ lib.makeScope newScope (self: with self; {
19631950 meta.platforms = stdenv.lib.platforms.unix;
19641951 }) {};
19651952
1966− xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
1953+ xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
19671954 name = "xf86-video-intel-2.99.917";
19681955 builder = ./builder.sh;
19691956 src = fetchurl {
@@ -1972,7 +1959,7 @@ lib.makeScope newScope (self: with self; {
19721959 };
19731960 hardeningDisable = [ "bindnow" "relro" ];
19741961 nativeBuildInputs = [ pkgconfig ];
1975− buildInputs = [ xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
1962+ buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
19761963 meta.platforms = stdenv.lib.platforms.unix;
19771964 }) {};
19781965
@@ -2353,6 +2340,19 @@ lib.makeScope newScope (self: with self; {
23532340 meta.platforms = stdenv.lib.platforms.unix;
23542341 }) {};
23552342
2343+ xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation {
2344+ name = "xfd-1.1.3";
2345+ builder = ./builder.sh;
2346+ src = fetchurl {
2347+ url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2;
2348+ sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr";
2349+ };
2350+ hardeningDisable = [ "bindnow" "relro" ];
2351+ nativeBuildInputs = [ pkgconfig gettext ];
2352+ buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ];
2353+ meta.platforms = stdenv.lib.platforms.unix;
2354+ }) {};
2355+
23562356 xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
23572357 name = "xfontsel-1.0.6";
23582358 builder = ./builder.sh;
@@ -2535,7 +2535,7 @@ lib.makeScope newScope (self: with self; {
25352535 meta.platforms = stdenv.lib.platforms.unix;
25362536 }) {};
25372537
2538− xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
2538+ xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation {
25392539 name = "xload-1.1.3";
25402540 builder = ./builder.sh;
25412541 src = fetchurl {
@@ -2543,7 +2543,7 @@ lib.makeScope newScope (self: with self; {
25432543 sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk";
25442544 };
25452545 hardeningDisable = [ "bindnow" "relro" ];
2546− nativeBuildInputs = [ pkgconfig ];
2546+ nativeBuildInputs = [ pkgconfig gettext ];
25472547 buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
25482548 meta.platforms = stdenv.lib.platforms.unix;
25492549 }) {};
@@ -2626,6 +2626,19 @@ lib.makeScope newScope (self: with self; {
26262626 meta.platforms = stdenv.lib.platforms.unix;
26272627 }) {};
26282628
2629+ xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
2630+ name = "xmore-1.0.3";
2631+ builder = ./builder.sh;
2632+ src = fetchurl {
2633+ url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2;
2634+ sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4";
2635+ };
2636+ hardeningDisable = [ "bindnow" "relro" ];
2637+ nativeBuildInputs = [ pkgconfig ];
2638+ buildInputs = [ libXaw libXt ];
2639+ meta.platforms = stdenv.lib.platforms.unix;
2640+ }) {};
2641+
26292642 xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
26302643 name = "xorg-cf-files-1.0.6";
26312644 builder = ./builder.sh;
@@ -2705,11 +2718,11 @@ lib.makeScope newScope (self: with self; {
27052718 }) {};
27062719
27072720 xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
2708− name = "xprop-1.2.3";
2721+ name = "xprop-1.2.4";
27092722 builder = ./builder.sh;
27102723 src = fetchurl {
2711− url = mirror://xorg/individual/app/xprop-1.2.3.tar.bz2;
2712− sha256 = "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj";
2724+ url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2;
2725+ sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc";
27132726 };
27142727 hardeningDisable = [ "bindnow" "relro" ];
27152728 nativeBuildInputs = [ pkgconfig ];
@@ -2809,11 +2822,11 @@ lib.makeScope newScope (self: with self; {
28092822 }) {};
28102823
28112824 xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
2812− name = "xtrans-1.3.5";
2825+ name = "xtrans-1.4.0";
28132826 builder = ./builder.sh;
28142827 src = fetchurl {
2815− url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2;
2816− sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd";
2828+ url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2;
2829+ sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p";
28172830 };
28182831 hardeningDisable = [ "bindnow" "relro" ];
28192832 nativeBuildInputs = [ pkgconfig ];
@@ -2847,7 +2860,7 @@ lib.makeScope newScope (self: with self; {
28472860 meta.platforms = stdenv.lib.platforms.unix;
28482861 }) {};
28492862
2850− xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
2863+ xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation {
28512864 name = "xwd-1.0.7";
28522865 builder = ./builder.sh;
28532866 src = fetchurl {
@@ -2856,7 +2869,7 @@ lib.makeScope newScope (self: with self; {
28562869 };
28572870 hardeningDisable = [ "bindnow" "relro" ];
28582871 nativeBuildInputs = [ pkgconfig ];
2859− buildInputs = [ libX11 xorgproto ];
2872+ buildInputs = [ libxkbfile libX11 xorgproto ];
28602873 meta.platforms = stdenv.lib.platforms.unix;
28612874 }) {};
28622875