@@ -1,20 +1,11 @@
11# THIS IS A GENERATED FILE. DO NOT EDIT!
2−args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
3−, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol, lib, newScope
4−, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
5−, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
2+{ lib, newScope, pixman }:
63
7−let
8−
9− overrides = import ./overrides.nix {inherit args;};
10−
11− xorg = lib.makeScope newScope xorgPackages;
12−
13− xorgPackages = self: with self; {
4+lib.makeScope newScope (self: with self; {
145
156 inherit pixman;
167
17− applewmproto = callPackage ({ stdenv }: stdenv.mkDerivation {
8+ applewmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
189 name = "applewmproto-1.4.2";
1910 builder = ./builder.sh;
2011 src = fetchurl {
@@ -27,7 +18,7 @@ let
2718 meta.platforms = stdenv.lib.platforms.unix;
2819 }) {};
2920
30− appres = callPackage ({ stdenv, libX11, xproto, libXt }: stdenv.mkDerivation {
21+ appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXt }: stdenv.mkDerivation {
3122 name = "appres-1.0.4";
3223 builder = ./builder.sh;
3324 src = fetchurl {
@@ -40,7 +31,7 @@ let
4031 meta.platforms = stdenv.lib.platforms.unix;
4132 }) {};
4233
43− bdftopcf = callPackage ({ stdenv }: stdenv.mkDerivation {
34+ bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
4435 name = "bdftopcf-1.1";
4536 builder = ./builder.sh;
4637 src = fetchurl {
@@ -53,7 +44,7 @@ let
5344 meta.platforms = stdenv.lib.platforms.unix;
5445 }) {};
5546
56− bigreqsproto = callPackage ({ stdenv }: stdenv.mkDerivation {
47+ bigreqsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
5748 name = "bigreqsproto-1.1.2";
5849 builder = ./builder.sh;
5950 src = fetchurl {
@@ -66,7 +57,7 @@ let
6657 meta.platforms = stdenv.lib.platforms.unix;
6758 }) {};
6859
69− bitmap = callPackage ({ stdenv, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation {
60+ bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation {
7061 name = "bitmap-1.0.8";
7162 builder = ./builder.sh;
7263 src = fetchurl {
@@ -79,7 +70,7 @@ let
7970 meta.platforms = stdenv.lib.platforms.unix;
8071 }) {};
8172
82− compositeproto = callPackage ({ stdenv }: stdenv.mkDerivation {
73+ compositeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
8374 name = "compositeproto-0.4.2";
8475 builder = ./builder.sh;
8576 src = fetchurl {
@@ -92,7 +83,7 @@ let
9283 meta.platforms = stdenv.lib.platforms.unix;
9384 }) {};
9485
95− damageproto = callPackage ({ stdenv }: stdenv.mkDerivation {
86+ damageproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
9687 name = "damageproto-1.2.1";
9788 builder = ./builder.sh;
9889 src = fetchurl {
@@ -105,7 +96,7 @@ let
10596 meta.platforms = stdenv.lib.platforms.unix;
10697 }) {};
10798
108− dmxproto = callPackage ({ stdenv }: stdenv.mkDerivation {
99+ dmxproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
109100 name = "dmxproto-2.3.1";
110101 builder = ./builder.sh;
111102 src = fetchurl {
@@ -118,7 +109,7 @@ let
118109 meta.platforms = stdenv.lib.platforms.unix;
119110 }) {};
120111
121− dri2proto = callPackage ({ stdenv }: stdenv.mkDerivation {
112+ dri2proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
122113 name = "dri2proto-2.8";
123114 builder = ./builder.sh;
124115 src = fetchurl {
@@ -131,7 +122,7 @@ let
131122 meta.platforms = stdenv.lib.platforms.unix;
132123 }) {};
133124
134− dri3proto = callPackage ({ stdenv }: stdenv.mkDerivation {
125+ dri3proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
135126 name = "dri3proto-1.0";
136127 builder = ./builder.sh;
137128 src = fetchurl {
@@ -144,7 +135,7 @@ let
144135 meta.platforms = stdenv.lib.platforms.unix;
145136 }) {};
146137
147− encodings = callPackage ({ stdenv }: stdenv.mkDerivation {
138+ encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
148139 name = "encodings-1.0.4";
149140 builder = ./builder.sh;
150141 src = fetchurl {
@@ -157,7 +148,7 @@ let
157148 meta.platforms = stdenv.lib.platforms.unix;
158149 }) {};
159150
160− fixesproto = callPackage ({ stdenv, xextproto }: stdenv.mkDerivation {
151+ fixesproto = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto }: stdenv.mkDerivation {
161152 name = "fixesproto-5.0";
162153 builder = ./builder.sh;
163154 src = fetchurl {
@@ -170,7 +161,7 @@ let
170161 meta.platforms = stdenv.lib.platforms.unix;
171162 }) {};
172163
173− fontadobe100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
164+ fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
174165 name = "font-adobe-100dpi-1.0.3";
175166 builder = ./builder.sh;
176167 src = fetchurl {
@@ -179,11 +170,12 @@ let
179170 };
180171 hardeningDisable = [ "bindnow" "relro" ];
181172 nativeBuildInputs = [ pkgconfig ];
182− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
173+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
174+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
183175 meta.platforms = stdenv.lib.platforms.unix;
184176 }) {};
185177
186− fontadobe75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
178+ fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
187179 name = "font-adobe-75dpi-1.0.3";
188180 builder = ./builder.sh;
189181 src = fetchurl {
@@ -192,11 +184,12 @@ let
192184 };
193185 hardeningDisable = [ "bindnow" "relro" ];
194186 nativeBuildInputs = [ pkgconfig ];
195− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
187+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
188+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
196189 meta.platforms = stdenv.lib.platforms.unix;
197190 }) {};
198191
199− fontadobeutopia100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
192+ fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
200193 name = "font-adobe-utopia-100dpi-1.0.4";
201194 builder = ./builder.sh;
202195 src = fetchurl {
@@ -205,11 +198,12 @@ let
205198 };
206199 hardeningDisable = [ "bindnow" "relro" ];
207200 nativeBuildInputs = [ pkgconfig ];
208− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
201+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
202+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
209203 meta.platforms = stdenv.lib.platforms.unix;
210204 }) {};
211205
212− fontadobeutopia75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
206+ fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
213207 name = "font-adobe-utopia-75dpi-1.0.4";
214208 builder = ./builder.sh;
215209 src = fetchurl {
@@ -218,11 +212,12 @@ let
218212 };
219213 hardeningDisable = [ "bindnow" "relro" ];
220214 nativeBuildInputs = [ pkgconfig ];
221− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
215+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
216+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
222217 meta.platforms = stdenv.lib.platforms.unix;
223218 }) {};
224219
225− fontadobeutopiatype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
220+ fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
226221 name = "font-adobe-utopia-type1-1.0.4";
227222 builder = ./builder.sh;
228223 src = fetchurl {
@@ -231,11 +226,12 @@ let
231226 };
232227 hardeningDisable = [ "bindnow" "relro" ];
233228 nativeBuildInputs = [ pkgconfig ];
234− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
229+ buildInputs = [ mkfontdir mkfontscale ];
230+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
235231 meta.platforms = stdenv.lib.platforms.unix;
236232 }) {};
237233
238− fontalias = callPackage ({ stdenv }: stdenv.mkDerivation {
234+ fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
239235 name = "font-alias-1.0.3";
240236 builder = ./builder.sh;
241237 src = fetchurl {
@@ -248,7 +244,7 @@ let
248244 meta.platforms = stdenv.lib.platforms.unix;
249245 }) {};
250246
251− fontarabicmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
247+ fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
252248 name = "font-arabic-misc-1.0.3";
253249 builder = ./builder.sh;
254250 src = fetchurl {
@@ -257,11 +253,12 @@ let
257253 };
258254 hardeningDisable = [ "bindnow" "relro" ];
259255 nativeBuildInputs = [ pkgconfig ];
260− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
256+ buildInputs = [ bdftopcf mkfontdir ];
257+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
261258 meta.platforms = stdenv.lib.platforms.unix;
262259 }) {};
263260
264− fontbh100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
261+ fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
265262 name = "font-bh-100dpi-1.0.3";
266263 builder = ./builder.sh;
267264 src = fetchurl {
@@ -270,11 +267,12 @@ let
270267 };
271268 hardeningDisable = [ "bindnow" "relro" ];
272269 nativeBuildInputs = [ pkgconfig ];
273− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
270+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
271+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
274272 meta.platforms = stdenv.lib.platforms.unix;
275273 }) {};
276274
277− fontbh75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
275+ fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
278276 name = "font-bh-75dpi-1.0.3";
279277 builder = ./builder.sh;
280278 src = fetchurl {
@@ -283,11 +281,12 @@ let
283281 };
284282 hardeningDisable = [ "bindnow" "relro" ];
285283 nativeBuildInputs = [ pkgconfig ];
286− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
284+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
285+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
287286 meta.platforms = stdenv.lib.platforms.unix;
288287 }) {};
289288
290− fontbhlucidatypewriter100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
289+ fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
291290 name = "font-bh-lucidatypewriter-100dpi-1.0.3";
292291 builder = ./builder.sh;
293292 src = fetchurl {
@@ -296,11 +295,12 @@ let
296295 };
297296 hardeningDisable = [ "bindnow" "relro" ];
298297 nativeBuildInputs = [ pkgconfig ];
299− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
298+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
299+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
300300 meta.platforms = stdenv.lib.platforms.unix;
301301 }) {};
302302
303− fontbhlucidatypewriter75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
303+ fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
304304 name = "font-bh-lucidatypewriter-75dpi-1.0.3";
305305 builder = ./builder.sh;
306306 src = fetchurl {
@@ -309,11 +309,12 @@ let
309309 };
310310 hardeningDisable = [ "bindnow" "relro" ];
311311 nativeBuildInputs = [ pkgconfig ];
312− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
312+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
313+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
313314 meta.platforms = stdenv.lib.platforms.unix;
314315 }) {};
315316
316− fontbhttf = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
317+ fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
317318 name = "font-bh-ttf-1.0.3";
318319 builder = ./builder.sh;
319320 src = fetchurl {
@@ -322,11 +323,12 @@ let
322323 };
323324 hardeningDisable = [ "bindnow" "relro" ];
324325 nativeBuildInputs = [ pkgconfig ];
325− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
326+ buildInputs = [ mkfontdir mkfontscale ];
327+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
326328 meta.platforms = stdenv.lib.platforms.unix;
327329 }) {};
328330
329− fontbhtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
331+ fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
330332 name = "font-bh-type1-1.0.3";
331333 builder = ./builder.sh;
332334 src = fetchurl {
@@ -335,11 +337,12 @@ let
335337 };
336338 hardeningDisable = [ "bindnow" "relro" ];
337339 nativeBuildInputs = [ pkgconfig ];
338− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
340+ buildInputs = [ mkfontdir mkfontscale ];
341+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
339342 meta.platforms = stdenv.lib.platforms.unix;
340343 }) {};
341344
342− fontbitstream100dpi = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
345+ fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
343346 name = "font-bitstream-100dpi-1.0.3";
344347 builder = ./builder.sh;
345348 src = fetchurl {
@@ -348,11 +351,12 @@ let
348351 };
349352 hardeningDisable = [ "bindnow" "relro" ];
350353 nativeBuildInputs = [ pkgconfig ];
351− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
354+ buildInputs = [ bdftopcf mkfontdir ];
355+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
352356 meta.platforms = stdenv.lib.platforms.unix;
353357 }) {};
354358
355− fontbitstream75dpi = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
359+ fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
356360 name = "font-bitstream-75dpi-1.0.3";
357361 builder = ./builder.sh;
358362 src = fetchurl {
@@ -361,11 +365,12 @@ let
361365 };
362366 hardeningDisable = [ "bindnow" "relro" ];
363367 nativeBuildInputs = [ pkgconfig ];
364− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
368+ buildInputs = [ bdftopcf mkfontdir ];
369+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
365370 meta.platforms = stdenv.lib.platforms.unix;
366371 }) {};
367372
368− fontbitstreamtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
373+ fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
369374 name = "font-bitstream-type1-1.0.3";
370375 builder = ./builder.sh;
371376 src = fetchurl {
@@ -374,11 +379,12 @@ let
374379 };
375380 hardeningDisable = [ "bindnow" "relro" ];
376381 nativeBuildInputs = [ pkgconfig ];
377− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
382+ buildInputs = [ mkfontdir mkfontscale ];
383+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
378384 meta.platforms = stdenv.lib.platforms.unix;
379385 }) {};
380386
381− fontcronyxcyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
387+ fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
382388 name = "font-cronyx-cyrillic-1.0.3";
383389 builder = ./builder.sh;
384390 src = fetchurl {
@@ -387,11 +393,12 @@ let
387393 };
388394 hardeningDisable = [ "bindnow" "relro" ];
389395 nativeBuildInputs = [ pkgconfig ];
390− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
396+ buildInputs = [ bdftopcf mkfontdir ];
397+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
391398 meta.platforms = stdenv.lib.platforms.unix;
392399 }) {};
393400
394− fontcursormisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
401+ fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
395402 name = "font-cursor-misc-1.0.3";
396403 builder = ./builder.sh;
397404 src = fetchurl {
@@ -400,11 +407,12 @@ let
400407 };
401408 hardeningDisable = [ "bindnow" "relro" ];
402409 nativeBuildInputs = [ pkgconfig ];
403− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
410+ buildInputs = [ bdftopcf mkfontdir ];
411+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
404412 meta.platforms = stdenv.lib.platforms.unix;
405413 }) {};
406414
407− fontdaewoomisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
415+ fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
408416 name = "font-daewoo-misc-1.0.3";
409417 builder = ./builder.sh;
410418 src = fetchurl {
@@ -413,11 +421,12 @@ let
413421 };
414422 hardeningDisable = [ "bindnow" "relro" ];
415423 nativeBuildInputs = [ pkgconfig ];
416− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
424+ buildInputs = [ bdftopcf mkfontdir ];
425+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
417426 meta.platforms = stdenv.lib.platforms.unix;
418427 }) {};
419428
420− fontdecmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
429+ fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
421430 name = "font-dec-misc-1.0.3";
422431 builder = ./builder.sh;
423432 src = fetchurl {
@@ -426,11 +435,12 @@ let
426435 };
427436 hardeningDisable = [ "bindnow" "relro" ];
428437 nativeBuildInputs = [ pkgconfig ];
429− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
438+ buildInputs = [ bdftopcf mkfontdir ];
439+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
430440 meta.platforms = stdenv.lib.platforms.unix;
431441 }) {};
432442
433− fontibmtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
443+ fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
434444 name = "font-ibm-type1-1.0.3";
435445 builder = ./builder.sh;
436446 src = fetchurl {
@@ -439,11 +449,12 @@ let
439449 };
440450 hardeningDisable = [ "bindnow" "relro" ];
441451 nativeBuildInputs = [ pkgconfig ];
442− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
452+ buildInputs = [ mkfontdir mkfontscale ];
453+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
443454 meta.platforms = stdenv.lib.platforms.unix;
444455 }) {};
445456
446− fontisasmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
457+ fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
447458 name = "font-isas-misc-1.0.3";
448459 builder = ./builder.sh;
449460 src = fetchurl {
@@ -452,11 +463,12 @@ let
452463 };
453464 hardeningDisable = [ "bindnow" "relro" ];
454465 nativeBuildInputs = [ pkgconfig ];
455− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
466+ buildInputs = [ bdftopcf mkfontdir ];
467+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
456468 meta.platforms = stdenv.lib.platforms.unix;
457469 }) {};
458470
459− fontjismisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
471+ fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
460472 name = "font-jis-misc-1.0.3";
461473 builder = ./builder.sh;
462474 src = fetchurl {
@@ -465,11 +477,12 @@ let
465477 };
466478 hardeningDisable = [ "bindnow" "relro" ];
467479 nativeBuildInputs = [ pkgconfig ];
468− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
480+ buildInputs = [ bdftopcf mkfontdir ];
481+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
469482 meta.platforms = stdenv.lib.platforms.unix;
470483 }) {};
471484
472− fontmicromisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
485+ fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
473486 name = "font-micro-misc-1.0.3";
474487 builder = ./builder.sh;
475488 src = fetchurl {
@@ -478,11 +491,12 @@ let
478491 };
479492 hardeningDisable = [ "bindnow" "relro" ];
480493 nativeBuildInputs = [ pkgconfig ];
481− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
494+ buildInputs = [ bdftopcf mkfontdir ];
495+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
482496 meta.platforms = stdenv.lib.platforms.unix;
483497 }) {};
484498
485− fontmisccyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
499+ fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
486500 name = "font-misc-cyrillic-1.0.3";
487501 builder = ./builder.sh;
488502 src = fetchurl {
@@ -491,11 +505,12 @@ let
491505 };
492506 hardeningDisable = [ "bindnow" "relro" ];
493507 nativeBuildInputs = [ pkgconfig ];
494− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
508+ buildInputs = [ bdftopcf mkfontdir ];
509+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
495510 meta.platforms = stdenv.lib.platforms.unix;
496511 }) {};
497512
498− fontmiscethiopic = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
513+ fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
499514 name = "font-misc-ethiopic-1.0.3";
500515 builder = ./builder.sh;
501516 src = fetchurl {
@@ -504,11 +519,12 @@ let
504519 };
505520 hardeningDisable = [ "bindnow" "relro" ];
506521 nativeBuildInputs = [ pkgconfig ];
507− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
522+ buildInputs = [ mkfontdir mkfontscale ];
523+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
508524 meta.platforms = stdenv.lib.platforms.unix;
509525 }) {};
510526
511− fontmiscmeltho = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
527+ fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
512528 name = "font-misc-meltho-1.0.3";
513529 builder = ./builder.sh;
514530 src = fetchurl {
@@ -517,11 +533,12 @@ let
517533 };
518534 hardeningDisable = [ "bindnow" "relro" ];
519535 nativeBuildInputs = [ pkgconfig ];
520− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
536+ buildInputs = [ mkfontdir mkfontscale ];
537+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
521538 meta.platforms = stdenv.lib.platforms.unix;
522539 }) {};
523540
524− fontmiscmisc = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
541+ fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
525542 name = "font-misc-misc-1.1.2";
526543 builder = ./builder.sh;
527544 src = fetchurl {
@@ -530,11 +547,12 @@ let
530547 };
531548 hardeningDisable = [ "bindnow" "relro" ];
532549 nativeBuildInputs = [ pkgconfig ];
533− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
550+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
551+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
534552 meta.platforms = stdenv.lib.platforms.unix;
535553 }) {};
536554
537− fontmuttmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
555+ fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
538556 name = "font-mutt-misc-1.0.3";
539557 builder = ./builder.sh;
540558 src = fetchurl {
@@ -543,11 +561,12 @@ let
543561 };
544562 hardeningDisable = [ "bindnow" "relro" ];
545563 nativeBuildInputs = [ pkgconfig ];
546− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
564+ buildInputs = [ bdftopcf mkfontdir ];
565+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
547566 meta.platforms = stdenv.lib.platforms.unix;
548567 }) {};
549568
550− fontschumachermisc = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
569+ fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
551570 name = "font-schumacher-misc-1.1.2";
552571 builder = ./builder.sh;
553572 src = fetchurl {
@@ -556,11 +575,12 @@ let
556575 };
557576 hardeningDisable = [ "bindnow" "relro" ];
558577 nativeBuildInputs = [ pkgconfig ];
559− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
578+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
579+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
560580 meta.platforms = stdenv.lib.platforms.unix;
561581 }) {};
562582
563− fontscreencyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
583+ fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
564584 name = "font-screen-cyrillic-1.0.4";
565585 builder = ./builder.sh;
566586 src = fetchurl {
@@ -569,11 +589,12 @@ let
569589 };
570590 hardeningDisable = [ "bindnow" "relro" ];
571591 nativeBuildInputs = [ pkgconfig ];
572− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
592+ buildInputs = [ bdftopcf mkfontdir ];
593+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
573594 meta.platforms = stdenv.lib.platforms.unix;
574595 }) {};
575596
576− fontsonymisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
597+ fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
577598 name = "font-sony-misc-1.0.3";
578599 builder = ./builder.sh;
579600 src = fetchurl {
@@ -582,11 +603,12 @@ let
582603 };
583604 hardeningDisable = [ "bindnow" "relro" ];
584605 nativeBuildInputs = [ pkgconfig ];
585− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
606+ buildInputs = [ bdftopcf mkfontdir ];
607+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
586608 meta.platforms = stdenv.lib.platforms.unix;
587609 }) {};
588610
589− fontsproto = callPackage ({ stdenv }: stdenv.mkDerivation {
611+ fontsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
590612 name = "fontsproto-2.1.3";
591613 builder = ./builder.sh;
592614 src = fetchurl {
@@ -599,7 +621,7 @@ let
599621 meta.platforms = stdenv.lib.platforms.unix;
600622 }) {};
601623
602− fontsunmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
624+ fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
603625 name = "font-sun-misc-1.0.3";
604626 builder = ./builder.sh;
605627 src = fetchurl {
@@ -608,11 +630,12 @@ let
608630 };
609631 hardeningDisable = [ "bindnow" "relro" ];
610632 nativeBuildInputs = [ pkgconfig ];
611− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
633+ buildInputs = [ bdftopcf mkfontdir ];
634+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
612635 meta.platforms = stdenv.lib.platforms.unix;
613636 }) {};
614637
615− fontutil = callPackage ({ stdenv }: stdenv.mkDerivation {
638+ fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
616639 name = "font-util-1.3.1";
617640 builder = ./builder.sh;
618641 src = fetchurl {
@@ -625,7 +648,7 @@ let
625648 meta.platforms = stdenv.lib.platforms.unix;
626649 }) {};
627650
628− fontwinitzkicyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation {
651+ fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
629652 name = "font-winitzki-cyrillic-1.0.3";
630653 builder = ./builder.sh;
631654 src = fetchurl {
@@ -634,11 +657,12 @@ let
634657 };
635658 hardeningDisable = [ "bindnow" "relro" ];
636659 nativeBuildInputs = [ pkgconfig ];
637− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
660+ buildInputs = [ bdftopcf mkfontdir ];
661+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
638662 meta.platforms = stdenv.lib.platforms.unix;
639663 }) {};
640664
641− fontxfree86type1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation {
665+ fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
642666 name = "font-xfree86-type1-1.0.4";
643667 builder = ./builder.sh;
644668 src = fetchurl {
@@ -647,11 +671,12 @@ let
647671 };
648672 hardeningDisable = [ "bindnow" "relro" ];
649673 nativeBuildInputs = [ pkgconfig ];
650− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
674+ buildInputs = [ mkfontdir mkfontscale ];
675+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
651676 meta.platforms = stdenv.lib.platforms.unix;
652677 }) {};
653678
654− gccmakedep = callPackage ({ stdenv }: stdenv.mkDerivation {
679+ gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
655680 name = "gccmakedep-1.0.3";
656681 builder = ./builder.sh;
657682 src = fetchurl {
@@ -664,7 +689,7 @@ let
664689 meta.platforms = stdenv.lib.platforms.unix;
665690 }) {};
666691
667− glproto = callPackage ({ stdenv }: stdenv.mkDerivation {
692+ glproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
668693 name = "glproto-1.4.17";
669694 builder = ./builder.sh;
670695 src = fetchurl {
@@ -677,7 +702,7 @@ let
677702 meta.platforms = stdenv.lib.platforms.unix;
678703 }) {};
679704
680− iceauth = callPackage ({ stdenv, libICE, xproto }: stdenv.mkDerivation {
705+ iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xproto }: stdenv.mkDerivation {
681706 name = "iceauth-1.0.7";
682707 builder = ./builder.sh;
683708 src = fetchurl {
@@ -690,7 +715,7 @@ let
690715 meta.platforms = stdenv.lib.platforms.unix;
691716 }) {};
692717
693− imake = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
718+ imake = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
694719 name = "imake-1.0.7";
695720 builder = ./builder.sh;
696721 src = fetchurl {
@@ -703,7 +728,7 @@ let
703728 meta.platforms = stdenv.lib.platforms.unix;
704729 }) {};
705730
706− inputproto = callPackage ({ stdenv }: stdenv.mkDerivation {
731+ inputproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
707732 name = "inputproto-2.3.2";
708733 builder = ./builder.sh;
709734 src = fetchurl {
@@ -716,7 +741,7 @@ let
716741 meta.platforms = stdenv.lib.platforms.unix;
717742 }) {};
718743
719− kbproto = callPackage ({ stdenv }: stdenv.mkDerivation {
744+ kbproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
720745 name = "kbproto-1.0.7";
721746 builder = ./builder.sh;
722747 src = fetchurl {
@@ -729,7 +754,7 @@ let
729754 meta.platforms = stdenv.lib.platforms.unix;
730755 }) {};
731756
732− libAppleWM = callPackage ({ stdenv, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
757+ libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
733758 name = "libAppleWM-1.4.1";
734759 builder = ./builder.sh;
735760 src = fetchurl {
@@ -742,7 +767,7 @@ let
742767 meta.platforms = stdenv.lib.platforms.unix;
743768 }) {};
744769
745− libFS = callPackage ({ stdenv, fontsproto, xproto, xtrans }: stdenv.mkDerivation {
770+ libFS = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, xproto, xtrans }: stdenv.mkDerivation {
746771 name = "libFS-1.0.7";
747772 builder = ./builder.sh;
748773 src = fetchurl {
@@ -755,7 +780,7 @@ let
755780 meta.platforms = stdenv.lib.platforms.unix;
756781 }) {};
757782
758− libICE = callPackage ({ stdenv, xproto, xtrans }: stdenv.mkDerivation {
783+ libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, xtrans }: stdenv.mkDerivation {
759784 name = "libICE-1.0.9";
760785 builder = ./builder.sh;
761786 src = fetchurl {
@@ -768,7 +793,7 @@ let
768793 meta.platforms = stdenv.lib.platforms.unix;
769794 }) {};
770795
771− libSM = callPackage ({ stdenv, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation {
796+ libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation {
772797 name = "libSM-1.2.2";
773798 builder = ./builder.sh;
774799 src = fetchurl {
@@ -781,7 +806,7 @@ let
781806 meta.platforms = stdenv.lib.platforms.unix;
782807 }) {};
783808
784− libWindowsWM = callPackage ({ stdenv, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
809+ libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
785810 name = "libWindowsWM-1.0.1";
786811 builder = ./builder.sh;
787812 src = fetchurl {
@@ -794,7 +819,7 @@ let
794819 meta.platforms = stdenv.lib.platforms.unix;
795820 }) {};
796821
797− libX11 = callPackage ({ stdenv, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation {
822+ libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation {
798823 name = "libX11-1.6.6";
799824 builder = ./builder.sh;
800825 src = fetchurl {
@@ -807,7 +832,7 @@ let
807832 meta.platforms = stdenv.lib.platforms.unix;
808833 }) {};
809834
810− libXScrnSaver = callPackage ({ stdenv, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
835+ libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
811836 name = "libXScrnSaver-1.2.2";
812837 builder = ./builder.sh;
813838 src = fetchurl {
@@ -820,7 +845,7 @@ let
820845 meta.platforms = stdenv.lib.platforms.unix;
821846 }) {};
822847
823− libXau = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
848+ libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
824849 name = "libXau-1.0.8";
825850 builder = ./builder.sh;
826851 src = fetchurl {
@@ -833,7 +858,7 @@ let
833858 meta.platforms = stdenv.lib.platforms.unix;
834859 }) {};
835860
836− libXaw = callPackage ({ stdenv, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation {
861+ libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation {
837862 name = "libXaw-1.0.13";
838863 builder = ./builder.sh;
839864 src = fetchurl {
@@ -846,7 +871,7 @@ let
846871 meta.platforms = stdenv.lib.platforms.unix;
847872 }) {};
848873
849− libXcomposite = callPackage ({ stdenv, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation {
874+ libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation {
850875 name = "libXcomposite-0.4.4";
851876 builder = ./builder.sh;
852877 src = fetchurl {
@@ -859,7 +884,7 @@ let
859884 meta.platforms = stdenv.lib.platforms.unix;
860885 }) {};
861886
862− libXcursor = callPackage ({ stdenv, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation {
887+ libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation {
863888 name = "libXcursor-1.1.15";
864889 builder = ./builder.sh;
865890 src = fetchurl {
@@ -872,7 +897,7 @@ let
872897 meta.platforms = stdenv.lib.platforms.unix;
873898 }) {};
874899
875− libXdamage = callPackage ({ stdenv, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation {
900+ libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation {
876901 name = "libXdamage-1.1.4";
877902 builder = ./builder.sh;
878903 src = fetchurl {
@@ -885,7 +910,7 @@ let
885910 meta.platforms = stdenv.lib.platforms.unix;
886911 }) {};
887912
888− libXdmcp = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
913+ libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
889914 name = "libXdmcp-1.1.2";
890915 builder = ./builder.sh;
891916 src = fetchurl {
@@ -898,7 +923,7 @@ let
898923 meta.platforms = stdenv.lib.platforms.unix;
899924 }) {};
900925
901− libXext = callPackage ({ stdenv, libX11, xextproto, xproto }: stdenv.mkDerivation {
926+ libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xextproto, xproto }: stdenv.mkDerivation {
902927 name = "libXext-1.3.3";
903928 builder = ./builder.sh;
904929 src = fetchurl {
@@ -911,7 +936,7 @@ let
911936 meta.platforms = stdenv.lib.platforms.unix;
912937 }) {};
913938
914− libXfixes = callPackage ({ stdenv, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation {
939+ libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation {
915940 name = "libXfixes-5.0.3";
916941 builder = ./builder.sh;
917942 src = fetchurl {
@@ -924,7 +949,7 @@ let
924949 meta.platforms = stdenv.lib.platforms.unix;
925950 }) {};
926951
927− libXfont = callPackage ({ stdenv, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation {
952+ libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation {
928953 name = "libXfont-1.5.4";
929954 builder = ./builder.sh;
930955 src = fetchurl {
@@ -937,7 +962,7 @@ let
937962 meta.platforms = stdenv.lib.platforms.unix;
938963 }) {};
939964
940− libXfont2 = callPackage ({ stdenv, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation {
965+ libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation {
941966 name = "libXfont2-2.0.3";
942967 builder = ./builder.sh;
943968 src = fetchurl {
@@ -950,7 +975,7 @@ let
950975 meta.platforms = stdenv.lib.platforms.unix;
951976 }) {};
952977
953− libXft = callPackage ({ stdenv, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation {
978+ libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation {
954979 name = "libXft-2.3.2";
955980 builder = ./builder.sh;
956981 src = fetchurl {
@@ -963,7 +988,7 @@ let
963988 meta.platforms = stdenv.lib.platforms.unix;
964989 }) {};
965990
966− libXi = callPackage ({ stdenv, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation {
991+ libXi = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation {
967992 name = "libXi-1.7.9";
968993 builder = ./builder.sh;
969994 src = fetchurl {
@@ -976,7 +1001,7 @@ let
9761001 meta.platforms = stdenv.lib.platforms.unix;
9771002 }) {};
9781003
979− libXinerama = callPackage ({ stdenv, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation {
1004+ libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation {
9801005 name = "libXinerama-1.1.3";
9811006 builder = ./builder.sh;
9821007 src = fetchurl {
@@ -989,7 +1014,7 @@ let
9891014 meta.platforms = stdenv.lib.platforms.unix;
9901015 }) {};
9911016
992− libXmu = callPackage ({ stdenv, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation {
1017+ libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation {
9931018 name = "libXmu-1.1.2";
9941019 builder = ./builder.sh;
9951020 src = fetchurl {
@@ -1002,7 +1027,7 @@ let
10021027 meta.platforms = stdenv.lib.platforms.unix;
10031028 }) {};
10041029
1005− libXp = callPackage ({ stdenv, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation {
1030+ libXp = callPackage ({ stdenv, pkgconfig, fetchurl, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation {
10061031 name = "libXp-1.0.3";
10071032 builder = ./builder.sh;
10081033 src = fetchurl {
@@ -1015,7 +1040,7 @@ let
10151040 meta.platforms = stdenv.lib.platforms.unix;
10161041 }) {};
10171042
1018− libXpm = callPackage ({ stdenv, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation {
1043+ libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation {
10191044 name = "libXpm-3.5.12";
10201045 builder = ./builder.sh;
10211046 src = fetchurl {
@@ -1028,7 +1053,7 @@ let
10281053 meta.platforms = stdenv.lib.platforms.unix;
10291054 }) {};
10301055
1031− libXpresent = callPackage ({ stdenv, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation {
1056+ libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation {
10321057 name = "libXpresent-1.0.0";
10331058 builder = ./builder.sh;
10341059 src = fetchurl {
@@ -1041,7 +1066,7 @@ let
10411066 meta.platforms = stdenv.lib.platforms.unix;
10421067 }) {};
10431068
1044− libXrandr = callPackage ({ stdenv, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation {
1069+ libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation {
10451070 name = "libXrandr-1.5.1";
10461071 builder = ./builder.sh;
10471072 src = fetchurl {
@@ -1054,7 +1079,7 @@ let
10541079 meta.platforms = stdenv.lib.platforms.unix;
10551080 }) {};
10561081
1057− libXrender = callPackage ({ stdenv, renderproto, libX11, xproto }: stdenv.mkDerivation {
1082+ libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, renderproto, libX11, xproto }: stdenv.mkDerivation {
10581083 name = "libXrender-0.9.10";
10591084 builder = ./builder.sh;
10601085 src = fetchurl {
@@ -1067,7 +1092,7 @@ let
10671092 meta.platforms = stdenv.lib.platforms.unix;
10681093 }) {};
10691094
1070− libXres = callPackage ({ stdenv, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation {
1095+ libXres = callPackage ({ stdenv, pkgconfig, fetchurl, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation {
10711096 name = "libXres-1.2.0";
10721097 builder = ./builder.sh;
10731098 src = fetchurl {
@@ -1080,7 +1105,7 @@ let
10801105 meta.platforms = stdenv.lib.platforms.unix;
10811106 }) {};
10821107
1083− libXt = callPackage ({ stdenv, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation {
1108+ libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation {
10841109 name = "libXt-1.1.5";
10851110 builder = ./builder.sh;
10861111 src = fetchurl {
@@ -1093,7 +1118,7 @@ let
10931118 meta.platforms = stdenv.lib.platforms.unix;
10941119 }) {};
10951120
1096− libXtst = callPackage ({ stdenv, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation {
1121+ libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation {
10971122 name = "libXtst-1.2.3";
10981123 builder = ./builder.sh;
10991124 src = fetchurl {
@@ -1106,7 +1131,7 @@ let
11061131 meta.platforms = stdenv.lib.platforms.unix;
11071132 }) {};
11081133
1109− libXv = callPackage ({ stdenv, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation {
1134+ libXv = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation {
11101135 name = "libXv-1.0.11";
11111136 builder = ./builder.sh;
11121137 src = fetchurl {
@@ -1119,7 +1144,7 @@ let
11191144 meta.platforms = stdenv.lib.platforms.unix;
11201145 }) {};
11211146
1122− libXvMC = callPackage ({ stdenv, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation {
1147+ libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation {
11231148 name = "libXvMC-1.0.10";
11241149 builder = ./builder.sh;
11251150 src = fetchurl {
@@ -1132,7 +1157,7 @@ let
11321157 meta.platforms = stdenv.lib.platforms.unix;
11331158 }) {};
11341159
1135− libXxf86dga = callPackage ({ stdenv, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation {
1160+ libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation {
11361161 name = "libXxf86dga-1.1.4";
11371162 builder = ./builder.sh;
11381163 src = fetchurl {
@@ -1145,7 +1170,7 @@ let
11451170 meta.platforms = stdenv.lib.platforms.unix;
11461171 }) {};
11471172
1148− libXxf86misc = callPackage ({ stdenv, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation {
1173+ libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation {
11491174 name = "libXxf86misc-1.0.3";
11501175 builder = ./builder.sh;
11511176 src = fetchurl {
@@ -1158,7 +1183,7 @@ let
11581183 meta.platforms = stdenv.lib.platforms.unix;
11591184 }) {};
11601185
1161− libXxf86vm = callPackage ({ stdenv, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation {
1186+ libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation {
11621187 name = "libXxf86vm-1.1.4";
11631188 builder = ./builder.sh;
11641189 src = fetchurl {
@@ -1171,7 +1196,7 @@ let
11711196 meta.platforms = stdenv.lib.platforms.unix;
11721197 }) {};
11731198
1174− libdmx = callPackage ({ stdenv, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
1199+ libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
11751200 name = "libdmx-1.1.3";
11761201 builder = ./builder.sh;
11771202 src = fetchurl {
@@ -1184,7 +1209,7 @@ let
11841209 meta.platforms = stdenv.lib.platforms.unix;
11851210 }) {};
11861211
1187− libfontenc = callPackage ({ stdenv, xproto, zlib }: stdenv.mkDerivation {
1212+ libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, zlib }: stdenv.mkDerivation {
11881213 name = "libfontenc-1.1.3";
11891214 builder = ./builder.sh;
11901215 src = fetchurl {
@@ -1197,7 +1222,7 @@ let
11971222 meta.platforms = stdenv.lib.platforms.unix;
11981223 }) {};
11991224
1200− libpciaccess = callPackage ({ stdenv, zlib }: stdenv.mkDerivation {
1225+ libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation {
12011226 name = "libpciaccess-0.14";
12021227 builder = ./builder.sh;
12031228 src = fetchurl {
@@ -1210,7 +1235,7 @@ let
12101235 meta.platforms = stdenv.lib.platforms.unix;
12111236 }) {};
12121237
1213− libpthreadstubs = callPackage ({ stdenv }: stdenv.mkDerivation {
1238+ libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12141239 name = "libpthread-stubs-0.4";
12151240 builder = ./builder.sh;
12161241 src = fetchurl {
@@ -1223,7 +1248,7 @@ let
12231248 meta.platforms = stdenv.lib.platforms.unix;
12241249 }) {};
12251250
1226− libxcb = callPackage ({ stdenv, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation {
1251+ libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation {
12271252 name = "libxcb-1.12";
12281253 builder = ./builder.sh;
12291254 src = fetchurl {
@@ -1236,7 +1261,7 @@ let
12361261 meta.platforms = stdenv.lib.platforms.unix;
12371262 }) {};
12381263
1239− libxkbfile = callPackage ({ stdenv, kbproto, libX11 }: stdenv.mkDerivation {
1264+ libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, kbproto, libX11 }: stdenv.mkDerivation {
12401265 name = "libxkbfile-1.0.9";
12411266 builder = ./builder.sh;
12421267 src = fetchurl {
@@ -1249,7 +1274,7 @@ let
12491274 meta.platforms = stdenv.lib.platforms.unix;
12501275 }) {};
12511276
1252− libxshmfence = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
1277+ libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
12531278 name = "libxshmfence-1.2";
12541279 builder = ./builder.sh;
12551280 src = fetchurl {
@@ -1262,7 +1287,7 @@ let
12621287 meta.platforms = stdenv.lib.platforms.unix;
12631288 }) {};
12641289
1265− lndir = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
1290+ lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
12661291 name = "lndir-1.0.3";
12671292 builder = ./builder.sh;
12681293 src = fetchurl {
@@ -1275,7 +1300,7 @@ let
12751300 meta.platforms = stdenv.lib.platforms.unix;
12761301 }) {};
12771302
1278− luit = callPackage ({ stdenv, libfontenc }: stdenv.mkDerivation {
1303+ luit = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc }: stdenv.mkDerivation {
12791304 name = "luit-1.1.1";
12801305 builder = ./builder.sh;
12811306 src = fetchurl {
@@ -1288,7 +1313,7 @@ let
12881313 meta.platforms = stdenv.lib.platforms.unix;
12891314 }) {};
12901315
1291− makedepend = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
1316+ makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
12921317 name = "makedepend-1.0.5";
12931318 builder = ./builder.sh;
12941319 src = fetchurl {
@@ -1301,7 +1326,7 @@ let
13011326 meta.platforms = stdenv.lib.platforms.unix;
13021327 }) {};
13031328
1304− mkfontdir = callPackage ({ stdenv }: stdenv.mkDerivation {
1329+ mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13051330 name = "mkfontdir-1.0.7";
13061331 builder = ./builder.sh;
13071332 src = fetchurl {
@@ -1314,7 +1339,7 @@ let
13141339 meta.platforms = stdenv.lib.platforms.unix;
13151340 }) {};
13161341
1317− mkfontscale = callPackage ({ stdenv, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation {
1342+ mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation {
13181343 name = "mkfontscale-1.1.2";
13191344 builder = ./builder.sh;
13201345 src = fetchurl {
@@ -1327,7 +1352,7 @@ let
13271352 meta.platforms = stdenv.lib.platforms.unix;
13281353 }) {};
13291354
1330− presentproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1355+ presentproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13311356 name = "presentproto-1.1";
13321357 builder = ./builder.sh;
13331358 src = fetchurl {
@@ -1340,7 +1365,7 @@ let
13401365 meta.platforms = stdenv.lib.platforms.unix;
13411366 }) {};
13421367
1343− printproto = callPackage ({ stdenv, libXau }: stdenv.mkDerivation {
1368+ printproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXau }: stdenv.mkDerivation {
13441369 name = "printproto-1.0.5";
13451370 builder = ./builder.sh;
13461371 src = fetchurl {
@@ -1353,7 +1378,7 @@ let
13531378 meta.platforms = stdenv.lib.platforms.unix;
13541379 }) {};
13551380
1356− randrproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1381+ randrproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13571382 name = "randrproto-1.5.0";
13581383 builder = ./builder.sh;
13591384 src = fetchurl {
@@ -1366,7 +1391,7 @@ let
13661391 meta.platforms = stdenv.lib.platforms.unix;
13671392 }) {};
13681393
1369− recordproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1394+ recordproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13701395 name = "recordproto-1.14.2";
13711396 builder = ./builder.sh;
13721397 src = fetchurl {
@@ -1379,7 +1404,7 @@ let
13791404 meta.platforms = stdenv.lib.platforms.unix;
13801405 }) {};
13811406
1382− renderproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1407+ renderproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13831408 name = "renderproto-0.11.1";
13841409 builder = ./builder.sh;
13851410 src = fetchurl {
@@ -1392,7 +1417,7 @@ let
13921417 meta.platforms = stdenv.lib.platforms.unix;
13931418 }) {};
13941419
1395− resourceproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1420+ resourceproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13961421 name = "resourceproto-1.2.0";
13971422 builder = ./builder.sh;
13981423 src = fetchurl {
@@ -1405,7 +1430,7 @@ let
14051430 meta.platforms = stdenv.lib.platforms.unix;
14061431 }) {};
14071432
1408− scrnsaverproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1433+ scrnsaverproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
14091434 name = "scrnsaverproto-1.2.2";
14101435 builder = ./builder.sh;
14111436 src = fetchurl {
@@ -1418,7 +1443,7 @@ let
14181443 meta.platforms = stdenv.lib.platforms.unix;
14191444 }) {};
14201445
1421− sessreg = callPackage ({ stdenv, xproto }: stdenv.mkDerivation {
1446+ sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
14221447 name = "sessreg-1.1.1";
14231448 builder = ./builder.sh;
14241449 src = fetchurl {
@@ -1431,7 +1456,7 @@ let
14311456 meta.platforms = stdenv.lib.platforms.unix;
14321457 }) {};
14331458
1434− setxkbmap = callPackage ({ stdenv, libX11, libxkbfile }: stdenv.mkDerivation {
1459+ setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation {
14351460 name = "setxkbmap-1.3.1";
14361461 builder = ./builder.sh;
14371462 src = fetchurl {
@@ -1444,7 +1469,7 @@ let
14441469 meta.platforms = stdenv.lib.platforms.unix;
14451470 }) {};
14461471
1447− smproxy = callPackage ({ stdenv, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation {
1472+ smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation {
14481473 name = "smproxy-1.0.6";
14491474 builder = ./builder.sh;
14501475 src = fetchurl {
@@ -1457,7 +1482,7 @@ let
14571482 meta.platforms = stdenv.lib.platforms.unix;
14581483 }) {};
14591484
1460− twm = callPackage ({ stdenv, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation {
1485+ twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation {
14611486 name = "twm-1.0.9";
14621487 builder = ./builder.sh;
14631488 src = fetchurl {
@@ -1470,7 +1495,7 @@ let
14701495 meta.platforms = stdenv.lib.platforms.unix;
14711496 }) {};
14721497
1473− utilmacros = callPackage ({ stdenv }: stdenv.mkDerivation {
1498+ utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
14741499 name = "util-macros-1.19.2";
14751500 builder = ./builder.sh;
14761501 src = fetchurl {
@@ -1483,7 +1508,7 @@ let
14831508 meta.platforms = stdenv.lib.platforms.unix;
14841509 }) {};
14851510
1486− videoproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1511+ videoproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
14871512 name = "videoproto-2.3.3";
14881513 builder = ./builder.sh;
14891514 src = fetchurl {
@@ -1496,7 +1521,7 @@ let
14961521 meta.platforms = stdenv.lib.platforms.unix;
14971522 }) {};
14981523
1499− windowswmproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1524+ windowswmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
15001525 name = "windowswmproto-1.0.4";
15011526 builder = ./builder.sh;
15021527 src = fetchurl {
@@ -1509,7 +1534,7 @@ let
15091534 meta.platforms = stdenv.lib.platforms.unix;
15101535 }) {};
15111536
1512− x11perf = callPackage ({ stdenv, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation {
1537+ x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation {
15131538 name = "x11perf-1.6.0";
15141539 builder = ./builder.sh;
15151540 src = fetchurl {
@@ -1522,7 +1547,7 @@ let
15221547 meta.platforms = stdenv.lib.platforms.unix;
15231548 }) {};
15241549
1525− xauth = callPackage ({ stdenv, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation {
1550+ xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation {
15261551 name = "xauth-1.0.10";
15271552 builder = ./builder.sh;
15281553 src = fetchurl {
@@ -1535,7 +1560,7 @@ let
15351560 meta.platforms = stdenv.lib.platforms.unix;
15361561 }) {};
15371562
1538− xbacklight = callPackage ({ stdenv, libxcb, xcbutil }: stdenv.mkDerivation {
1563+ xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation {
15391564 name = "xbacklight-1.2.2";
15401565 builder = ./builder.sh;
15411566 src = fetchurl {
@@ -1548,7 +1573,7 @@ let
15481573 meta.platforms = stdenv.lib.platforms.unix;
15491574 }) {};
15501575
1551− xbitmaps = callPackage ({ stdenv }: stdenv.mkDerivation {
1576+ xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
15521577 name = "xbitmaps-1.1.1";
15531578 builder = ./builder.sh;
15541579 src = fetchurl {
@@ -1561,7 +1586,7 @@ let
15611586 meta.platforms = stdenv.lib.platforms.unix;
15621587 }) {};
15631588
1564− xcbproto = callPackage ({ stdenv, python }: stdenv.mkDerivation {
1589+ xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
15651590 name = "xcb-proto-1.12";
15661591 builder = ./builder.sh;
15671592 src = fetchurl {
@@ -1574,7 +1599,7 @@ let
15741599 meta.platforms = stdenv.lib.platforms.unix;
15751600 }) {};
15761601
1577− xcbutil = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
1602+ xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
15781603 name = "xcb-util-0.4.0";
15791604 builder = ./builder.sh;
15801605 src = fetchurl {
@@ -1587,7 +1612,7 @@ let
15871612 meta.platforms = stdenv.lib.platforms.unix;
15881613 }) {};
15891614
1590− xcbutilcursor = callPackage ({ stdenv, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation {
1615+ xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation {
15911616 name = "xcb-util-cursor-0.1.3";
15921617 builder = ./builder.sh;
15931618 src = fetchurl {
@@ -1600,7 +1625,7 @@ let
16001625 meta.platforms = stdenv.lib.platforms.unix;
16011626 }) {};
16021627
1603− xcbutilerrors = callPackage ({ stdenv, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation {
1628+ xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation {
16041629 name = "xcb-util-errors-1.0";
16051630 builder = ./builder.sh;
16061631 src = fetchurl {
@@ -1613,7 +1638,7 @@ let
16131638 meta.platforms = stdenv.lib.platforms.unix;
16141639 }) {};
16151640
1616− xcbutilimage = callPackage ({ stdenv, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation {
1641+ xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation {
16171642 name = "xcb-util-image-0.4.0";
16181643 builder = ./builder.sh;
16191644 src = fetchurl {
@@ -1626,7 +1651,7 @@ let
16261651 meta.platforms = stdenv.lib.platforms.unix;
16271652 }) {};
16281653
1629− xcbutilkeysyms = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
1654+ xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
16301655 name = "xcb-util-keysyms-0.4.0";
16311656 builder = ./builder.sh;
16321657 src = fetchurl {
@@ -1639,7 +1664,7 @@ let
16391664 meta.platforms = stdenv.lib.platforms.unix;
16401665 }) {};
16411666
1642− xcbutilrenderutil = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
1667+ xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
16431668 name = "xcb-util-renderutil-0.3.9";
16441669 builder = ./builder.sh;
16451670 src = fetchurl {
@@ -1652,7 +1677,7 @@ let
16521677 meta.platforms = stdenv.lib.platforms.unix;
16531678 }) {};
16541679
1655− xcbutilwm = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
1680+ xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
16561681 name = "xcb-util-wm-0.4.1";
16571682 builder = ./builder.sh;
16581683 src = fetchurl {
@@ -1665,7 +1690,7 @@ let
16651690 meta.platforms = stdenv.lib.platforms.unix;
16661691 }) {};
16671692
1668− xclock = callPackage ({ stdenv, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation {
1693+ xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation {
16691694 name = "xclock-1.0.7";
16701695 builder = ./builder.sh;
16711696 src = fetchurl {
@@ -1678,7 +1703,7 @@ let
16781703 meta.platforms = stdenv.lib.platforms.unix;
16791704 }) {};
16801705
1681− xcmiscproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1706+ xcmiscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
16821707 name = "xcmiscproto-1.2.2";
16831708 builder = ./builder.sh;
16841709 src = fetchurl {
@@ -1691,7 +1716,7 @@ let
16911716 meta.platforms = stdenv.lib.platforms.unix;
16921717 }) {};
16931718
1694− xcmsdb = callPackage ({ stdenv, libX11 }: stdenv.mkDerivation {
1719+ xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation {
16951720 name = "xcmsdb-1.0.5";
16961721 builder = ./builder.sh;
16971722 src = fetchurl {
@@ -1704,7 +1729,7 @@ let
17041729 meta.platforms = stdenv.lib.platforms.unix;
17051730 }) {};
17061731
1707− xcompmgr = callPackage ({ stdenv, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation {
1732+ xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation {
17081733 name = "xcompmgr-1.1.7";
17091734 builder = ./builder.sh;
17101735 src = fetchurl {
@@ -1717,7 +1742,7 @@ let
17171742 meta.platforms = stdenv.lib.platforms.unix;
17181743 }) {};
17191744
1720− xcursorgen = callPackage ({ stdenv, libpng, libX11, libXcursor }: stdenv.mkDerivation {
1745+ xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation {
17211746 name = "xcursorgen-1.0.6";
17221747 builder = ./builder.sh;
17231748 src = fetchurl {
@@ -1730,7 +1755,7 @@ let
17301755 meta.platforms = stdenv.lib.platforms.unix;
17311756 }) {};
17321757
1733− xcursorthemes = callPackage ({ stdenv, libXcursor }: stdenv.mkDerivation {
1758+ xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation {
17341759 name = "xcursor-themes-1.0.4";
17351760 builder = ./builder.sh;
17361761 src = fetchurl {
@@ -1743,7 +1768,7 @@ let
17431768 meta.platforms = stdenv.lib.platforms.unix;
17441769 }) {};
17451770
1746− xdm = callPackage ({ stdenv, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation {
1771+ xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation {
17471772 name = "xdm-1.1.11";
17481773 builder = ./builder.sh;
17491774 src = fetchurl {
@@ -1756,7 +1781,7 @@ let
17561781 meta.platforms = stdenv.lib.platforms.unix;
17571782 }) {};
17581783
1759− xdpyinfo = callPackage ({ stdenv, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation {
1784+ xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation {
17601785 name = "xdpyinfo-1.3.2";
17611786 builder = ./builder.sh;
17621787 src = fetchurl {
@@ -1769,7 +1794,7 @@ let
17691794 meta.platforms = stdenv.lib.platforms.unix;
17701795 }) {};
17711796
1772− xdriinfo = callPackage ({ stdenv, glproto, libX11 }: stdenv.mkDerivation {
1797+ xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, glproto, libX11 }: stdenv.mkDerivation {
17731798 name = "xdriinfo-1.0.5";
17741799 builder = ./builder.sh;
17751800 src = fetchurl {
@@ -1782,7 +1807,7 @@ let
17821807 meta.platforms = stdenv.lib.platforms.unix;
17831808 }) {};
17841809
1785− xev = callPackage ({ stdenv, libX11, xproto, libXrandr }: stdenv.mkDerivation {
1810+ xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr }: stdenv.mkDerivation {
17861811 name = "xev-1.2.2";
17871812 builder = ./builder.sh;
17881813 src = fetchurl {
@@ -1795,7 +1820,7 @@ let
17951820 meta.platforms = stdenv.lib.platforms.unix;
17961821 }) {};
17971822
1798− xextproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1823+ xextproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
17991824 name = "xextproto-7.3.0";
18001825 builder = ./builder.sh;
18011826 src = fetchurl {
@@ -1808,7 +1833,7 @@ let
18081833 meta.platforms = stdenv.lib.platforms.unix;
18091834 }) {};
18101835
1811− xeyes = callPackage ({ stdenv, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation {
1836+ xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation {
18121837 name = "xeyes-1.1.2";
18131838 builder = ./builder.sh;
18141839 src = fetchurl {
@@ -1821,7 +1846,7 @@ let
18211846 meta.platforms = stdenv.lib.platforms.unix;
18221847 }) {};
18231848
1824− xf86bigfontproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1849+ xf86bigfontproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
18251850 name = "xf86bigfontproto-1.2.0";
18261851 builder = ./builder.sh;
18271852 src = fetchurl {
@@ -1834,7 +1859,7 @@ let
18341859 meta.platforms = stdenv.lib.platforms.unix;
18351860 }) {};
18361861
1837− xf86dgaproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1862+ xf86dgaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
18381863 name = "xf86dgaproto-2.1";
18391864 builder = ./builder.sh;
18401865 src = fetchurl {
@@ -1847,7 +1872,7 @@ let
18471872 meta.platforms = stdenv.lib.platforms.unix;
18481873 }) {};
18491874
1850− xf86driproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1875+ xf86driproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
18511876 name = "xf86driproto-2.1.1";
18521877 builder = ./builder.sh;
18531878 src = fetchurl {
@@ -1860,7 +1885,7 @@ let
18601885 meta.platforms = stdenv.lib.platforms.unix;
18611886 }) {};
18621887
1863− xf86inputevdev = callPackage ({ stdenv, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation {
1888+ xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation {
18641889 name = "xf86-input-evdev-2.10.5";
18651890 builder = ./builder.sh;
18661891 src = fetchurl {
@@ -1873,7 +1898,7 @@ let
18731898 meta.platforms = stdenv.lib.platforms.unix;
18741899 }) {};
18751900
1876− xf86inputjoystick = callPackage ({ stdenv, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation {
1901+ xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation {
18771902 name = "xf86-input-joystick-1.6.3";
18781903 builder = ./builder.sh;
18791904 src = fetchurl {
@@ -1886,7 +1911,7 @@ let
18861911 meta.platforms = stdenv.lib.platforms.unix;
18871912 }) {};
18881913
1889− xf86inputkeyboard = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
1914+ xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
18901915 name = "xf86-input-keyboard-1.9.0";
18911916 builder = ./builder.sh;
18921917 src = fetchurl {
@@ -1899,7 +1924,7 @@ let
18991924 meta.platforms = stdenv.lib.platforms.unix;
19001925 }) {};
19011926
1902− xf86inputlibinput = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
1927+ xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
19031928 name = "xf86-input-libinput-0.26.0";
19041929 builder = ./builder.sh;
19051930 src = fetchurl {
@@ -1912,7 +1937,7 @@ let
19121937 meta.platforms = stdenv.lib.platforms.unix;
19131938 }) {};
19141939
1915− xf86inputmouse = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
1940+ xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
19161941 name = "xf86-input-mouse-1.9.2";
19171942 builder = ./builder.sh;
19181943 src = fetchurl {
@@ -1925,7 +1950,7 @@ let
19251950 meta.platforms = stdenv.lib.platforms.unix;
19261951 }) {};
19271952
1928− xf86inputsynaptics = callPackage ({ stdenv, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation {
1953+ xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation {
19291954 name = "xf86-input-synaptics-1.9.0";
19301955 builder = ./builder.sh;
19311956 src = fetchurl {
@@ -1938,7 +1963,7 @@ let
19381963 meta.platforms = stdenv.lib.platforms.unix;
19391964 }) {};
19401965
1941− xf86inputvmmouse = callPackage ({ stdenv, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation {
1966+ xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation {
19421967 name = "xf86-input-vmmouse-13.1.0";
19431968 builder = ./builder.sh;
19441969 src = fetchurl {
@@ -1951,7 +1976,7 @@ let
19511976 meta.platforms = stdenv.lib.platforms.unix;
19521977 }) {};
19531978
1954− xf86inputvoid = callPackage ({ stdenv, xorgserver, xproto }: stdenv.mkDerivation {
1979+ xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation {
19551980 name = "xf86-input-void-1.4.1";
19561981 builder = ./builder.sh;
19571982 src = fetchurl {
@@ -1964,7 +1989,7 @@ let
19641989 meta.platforms = stdenv.lib.platforms.unix;
19651990 }) {};
19661991
1967− xf86miscproto = callPackage ({ stdenv }: stdenv.mkDerivation {
1992+ xf86miscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
19681993 name = "xf86miscproto-0.9.3";
19691994 builder = ./builder.sh;
19701995 src = fetchurl {
@@ -1977,7 +2002,7 @@ let
19772002 meta.platforms = stdenv.lib.platforms.unix;
19782003 }) {};
19792004
1980− xf86videoamdgpu = callPackage ({ stdenv, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
2005+ xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
19812006 name = "xf86-video-amdgpu-1.4.0";
19822007 builder = ./builder.sh;
19832008 src = fetchurl {
@@ -1990,7 +2015,7 @@ let
19902015 meta.platforms = stdenv.lib.platforms.unix;
19912016 }) {};
19922017
1993− xf86videoark = callPackage ({ stdenv, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2018+ xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
19942019 name = "xf86-video-ark-0.7.5";
19952020 builder = ./builder.sh;
19962021 src = fetchurl {
@@ -2003,7 +2028,7 @@ let
20032028 meta.platforms = stdenv.lib.platforms.unix;
20042029 }) {};
20052030
2006− xf86videoast = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2031+ xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20072032 name = "xf86-video-ast-1.1.5";
20082033 builder = ./builder.sh;
20092034 src = fetchurl {
@@ -2016,7 +2041,7 @@ let
20162041 meta.platforms = stdenv.lib.platforms.unix;
20172042 }) {};
20182043
2019− xf86videoati = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
2044+ xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
20202045 name = "xf86-video-ati-18.0.1";
20212046 builder = ./builder.sh;
20222047 src = fetchurl {
@@ -2029,7 +2054,7 @@ let
20292054 meta.platforms = stdenv.lib.platforms.unix;
20302055 }) {};
20312056
2032− xf86videochips = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2057+ xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20332058 name = "xf86-video-chips-1.2.7";
20342059 builder = ./builder.sh;
20352060 src = fetchurl {
@@ -2042,7 +2067,7 @@ let
20422067 meta.platforms = stdenv.lib.platforms.unix;
20432068 }) {};
20442069
2045− xf86videocirrus = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2070+ xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20462071 name = "xf86-video-cirrus-1.5.3";
20472072 builder = ./builder.sh;
20482073 src = fetchurl {
@@ -2055,7 +2080,7 @@ let
20552080 meta.platforms = stdenv.lib.platforms.unix;
20562081 }) {};
20572082
2058− xf86videodummy = callPackage ({ stdenv, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
2083+ xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
20592084 name = "xf86-video-dummy-0.3.8";
20602085 builder = ./builder.sh;
20612086 src = fetchurl {
@@ -2068,7 +2093,7 @@ let
20682093 meta.platforms = stdenv.lib.platforms.unix;
20692094 }) {};
20702095
2071− xf86videofbdev = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
2096+ xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
20722097 name = "xf86-video-fbdev-0.4.4";
20732098 builder = ./builder.sh;
20742099 src = fetchurl {
@@ -2081,7 +2106,7 @@ let
20812106 meta.platforms = stdenv.lib.platforms.unix;
20822107 }) {};
20832108
2084− xf86videogeode = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2109+ xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20852110 name = "xf86-video-geode-2.11.17";
20862111 builder = ./builder.sh;
20872112 src = fetchurl {
@@ -2094,7 +2119,7 @@ let
20942119 meta.platforms = stdenv.lib.platforms.unix;
20952120 }) {};
20962121
2097− xf86videoglide = callPackage ({ stdenv, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2122+ xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20982123 name = "xf86-video-glide-1.2.2";
20992124 builder = ./builder.sh;
21002125 src = fetchurl {
@@ -2107,7 +2132,7 @@ let
21072132 meta.platforms = stdenv.lib.platforms.unix;
21082133 }) {};
21092134
2110− xf86videoglint = callPackage ({ stdenv, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
2135+ xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
21112136 name = "xf86-video-glint-1.2.9";
21122137 builder = ./builder.sh;
21132138 src = fetchurl {
@@ -2120,7 +2145,7 @@ let
21202145 meta.platforms = stdenv.lib.platforms.unix;
21212146 }) {};
21222147
2123− xf86videoi128 = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2148+ xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
21242149 name = "xf86-video-i128-1.3.6";
21252150 builder = ./builder.sh;
21262151 src = fetchurl {
@@ -2133,7 +2158,7 @@ let
21332158 meta.platforms = stdenv.lib.platforms.unix;
21342159 }) {};
21352160
2136− xf86videoi740 = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2161+ xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
21372162 name = "xf86-video-i740-1.3.6";
21382163 builder = ./builder.sh;
21392164 src = fetchurl {
@@ -2146,7 +2171,7 @@ let
21462171 meta.platforms = stdenv.lib.platforms.unix;
21472172 }) {};
21482173
2149− xf86videointel = callPackage ({ stdenv, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
2174+ xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
21502175 name = "xf86-video-intel-2.99.917";
21512176 builder = ./builder.sh;
21522177 src = fetchurl {
@@ -2159,7 +2184,7 @@ let
21592184 meta.platforms = stdenv.lib.platforms.unix;
21602185 }) {};
21612186
2162− xf86videomach64 = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
2187+ xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
21632188 name = "xf86-video-mach64-6.9.5";
21642189 builder = ./builder.sh;
21652190 src = fetchurl {
@@ -2172,7 +2197,7 @@ let
21722197 meta.platforms = stdenv.lib.platforms.unix;
21732198 }) {};
21742199
2175− xf86videomga = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
2200+ xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
21762201 name = "xf86-video-mga-1.6.5";
21772202 builder = ./builder.sh;
21782203 src = fetchurl {
@@ -2185,7 +2210,7 @@ let
21852210 meta.platforms = stdenv.lib.platforms.unix;
21862211 }) {};
21872212
2188− xf86videoneomagic = callPackage ({ stdenv, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation {
2213+ xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation {
21892214 name = "xf86-video-neomagic-1.2.9";
21902215 builder = ./builder.sh;
21912216 src = fetchurl {
@@ -2198,7 +2223,7 @@ let
21982223 meta.platforms = stdenv.lib.platforms.unix;
21992224 }) {};
22002225
2201− xf86videonewport = callPackage ({ stdenv, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
2226+ xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
22022227 name = "xf86-video-newport-0.2.4";
22032228 builder = ./builder.sh;
22042229 src = fetchurl {
@@ -2211,7 +2236,7 @@ let
22112236 meta.platforms = stdenv.lib.platforms.unix;
22122237 }) {};
22132238
2214− xf86videonouveau = callPackage ({ stdenv, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2239+ xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
22152240 name = "xf86-video-nouveau-1.0.15";
22162241 builder = ./builder.sh;
22172242 src = fetchurl {
@@ -2224,7 +2249,7 @@ let
22242249 meta.platforms = stdenv.lib.platforms.unix;
22252250 }) {};
22262251
2227− xf86videonv = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2252+ xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
22282253 name = "xf86-video-nv-2.1.21";
22292254 builder = ./builder.sh;
22302255 src = fetchurl {
@@ -2237,7 +2262,7 @@ let
22372262 meta.platforms = stdenv.lib.platforms.unix;
22382263 }) {};
22392264
2240− xf86videoopenchrome = callPackage ({ stdenv, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation {
2265+ xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation {
22412266 name = "xf86-video-openchrome-0.6.0";
22422267 builder = ./builder.sh;
22432268 src = fetchurl {
@@ -2250,7 +2275,7 @@ let
22502275 meta.platforms = stdenv.lib.platforms.unix;
22512276 }) {};
22522277
2253− xf86videoqxl = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
2278+ xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
22542279 name = "xf86-video-qxl-0.1.5";
22552280 builder = ./builder.sh;
22562281 src = fetchurl {
@@ -2263,7 +2288,7 @@ let
22632288 meta.platforms = stdenv.lib.platforms.unix;
22642289 }) {};
22652290
2266− xf86videor128 = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation {
2291+ xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation {
22672292 name = "xf86-video-r128-6.10.2";
22682293 builder = ./builder.sh;
22692294 src = fetchurl {
@@ -2276,7 +2301,7 @@ let
22762301 meta.platforms = stdenv.lib.platforms.unix;
22772302 }) {};
22782303
2279− xf86videorendition = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2304+ xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
22802305 name = "xf86-video-rendition-4.2.6";
22812306 builder = ./builder.sh;
22822307 src = fetchurl {
@@ -2289,7 +2314,7 @@ let
22892314 meta.platforms = stdenv.lib.platforms.unix;
22902315 }) {};
22912316
2292− xf86videos3virge = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2317+ xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
22932318 name = "xf86-video-s3virge-1.10.7";
22942319 builder = ./builder.sh;
22952320 src = fetchurl {
@@ -2302,7 +2327,7 @@ let
23022327 meta.platforms = stdenv.lib.platforms.unix;
23032328 }) {};
23042329
2305− xf86videosavage = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
2330+ xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
23062331 name = "xf86-video-savage-2.3.9";
23072332 builder = ./builder.sh;
23082333 src = fetchurl {
@@ -2315,7 +2340,7 @@ let
23152340 meta.platforms = stdenv.lib.platforms.unix;
23162341 }) {};
23172342
2318− xf86videosiliconmotion = callPackage ({ stdenv, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2343+ xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
23192344 name = "xf86-video-siliconmotion-1.7.9";
23202345 builder = ./builder.sh;
23212346 src = fetchurl {
@@ -2328,7 +2353,7 @@ let
23282353 meta.platforms = stdenv.lib.platforms.unix;
23292354 }) {};
23302355
2331− xf86videosis = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
2356+ xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
23322357 name = "xf86-video-sis-0.10.9";
23332358 builder = ./builder.sh;
23342359 src = fetchurl {
@@ -2341,7 +2366,7 @@ let
23412366 meta.platforms = stdenv.lib.platforms.unix;
23422367 }) {};
23432368
2344− xf86videosisusb = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
2369+ xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
23452370 name = "xf86-video-sisusb-0.9.7";
23462371 builder = ./builder.sh;
23472372 src = fetchurl {
@@ -2354,7 +2379,7 @@ let
23542379 meta.platforms = stdenv.lib.platforms.unix;
23552380 }) {};
23562381
2357− xf86videosuncg6 = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation {
2382+ xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation {
23582383 name = "xf86-video-suncg6-1.1.2";
23592384 builder = ./builder.sh;
23602385 src = fetchurl {
@@ -2367,7 +2392,7 @@ let
23672392 meta.platforms = stdenv.lib.platforms.unix;
23682393 }) {};
23692394
2370− xf86videosunffb = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2395+ xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
23712396 name = "xf86-video-sunffb-1.2.2";
23722397 builder = ./builder.sh;
23732398 src = fetchurl {
@@ -2380,7 +2405,7 @@ let
23802405 meta.platforms = stdenv.lib.platforms.unix;
23812406 }) {};
23822407
2383− xf86videosunleo = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation {
2408+ xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation {
23842409 name = "xf86-video-sunleo-1.2.2";
23852410 builder = ./builder.sh;
23862411 src = fetchurl {
@@ -2393,7 +2418,7 @@ let
23932418 meta.platforms = stdenv.lib.platforms.unix;
23942419 }) {};
23952420
2396− xf86videotdfx = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
2421+ xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
23972422 name = "xf86-video-tdfx-1.4.7";
23982423 builder = ./builder.sh;
23992424 src = fetchurl {
@@ -2406,7 +2431,7 @@ let
24062431 meta.platforms = stdenv.lib.platforms.unix;
24072432 }) {};
24082433
2409− xf86videotga = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
2434+ xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
24102435 name = "xf86-video-tga-1.2.2";
24112436 builder = ./builder.sh;
24122437 src = fetchurl {
@@ -2419,7 +2444,7 @@ let
24192444 meta.platforms = stdenv.lib.platforms.unix;
24202445 }) {};
24212446
2422− xf86videotrident = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
2447+ xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
24232448 name = "xf86-video-trident-1.3.8";
24242449 builder = ./builder.sh;
24252450 src = fetchurl {
@@ -2432,7 +2457,7 @@ let
24322457 meta.platforms = stdenv.lib.platforms.unix;
24332458 }) {};
24342459
2435− xf86videov4l = callPackage ({ stdenv, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
2460+ xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
24362461 name = "xf86-video-v4l-0.2.0";
24372462 builder = ./builder.sh;
24382463 src = fetchurl {
@@ -2445,7 +2470,7 @@ let
24452470 meta.platforms = stdenv.lib.platforms.unix;
24462471 }) {};
24472472
2448− xf86videovesa = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
2473+ xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
24492474 name = "xf86-video-vesa-2.4.0";
24502475 builder = ./builder.sh;
24512476 src = fetchurl {
@@ -2458,7 +2483,7 @@ let
24582483 meta.platforms = stdenv.lib.platforms.unix;
24592484 }) {};
24602485
2461− xf86videovmware = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
2486+ xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
24622487 name = "xf86-video-vmware-13.2.1";
24632488 builder = ./builder.sh;
24642489 src = fetchurl {
@@ -2471,7 +2496,7 @@ let
24712496 meta.platforms = stdenv.lib.platforms.unix;
24722497 }) {};
24732498
2474− xf86videovoodoo = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
2499+ xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
24752500 name = "xf86-video-voodoo-1.2.5";
24762501 builder = ./builder.sh;
24772502 src = fetchurl {
@@ -2484,7 +2509,7 @@ let
24842509 meta.platforms = stdenv.lib.platforms.unix;
24852510 }) {};
24862511
2487− xf86videowsfb = callPackage ({ stdenv, xorgserver, xproto }: stdenv.mkDerivation {
2512+ xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation {
24882513 name = "xf86-video-wsfb-0.4.0";
24892514 builder = ./builder.sh;
24902515 src = fetchurl {
@@ -2497,7 +2522,7 @@ let
24972522 meta.platforms = stdenv.lib.platforms.unix;
24982523 }) {};
24992524
2500− xf86videoxgi = callPackage ({ stdenv, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
2525+ xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
25012526 name = "xf86-video-xgi-1.6.1";
25022527 builder = ./builder.sh;
25032528 src = fetchurl {
@@ -2510,7 +2535,7 @@ let
25102535 meta.platforms = stdenv.lib.platforms.unix;
25112536 }) {};
25122537
2513− xf86vidmodeproto = callPackage ({ stdenv }: stdenv.mkDerivation {
2538+ xf86vidmodeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
25142539 name = "xf86vidmodeproto-2.3.1";
25152540 builder = ./builder.sh;
25162541 src = fetchurl {
@@ -2523,7 +2548,7 @@ let
25232548 meta.platforms = stdenv.lib.platforms.unix;
25242549 }) {};
25252550
2526− xfs = callPackage ({ stdenv, libXfont, xproto, xtrans }: stdenv.mkDerivation {
2551+ xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xproto, xtrans }: stdenv.mkDerivation {
25272552 name = "xfs-1.1.4";
25282553 builder = ./builder.sh;
25292554 src = fetchurl {
@@ -2536,7 +2561,7 @@ let
25362561 meta.platforms = stdenv.lib.platforms.unix;
25372562 }) {};
25382563
2539− xgamma = callPackage ({ stdenv, libX11, xproto, libXxf86vm }: stdenv.mkDerivation {
2564+ xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXxf86vm }: stdenv.mkDerivation {
25402565 name = "xgamma-1.0.6";
25412566 builder = ./builder.sh;
25422567 src = fetchurl {
@@ -2549,7 +2574,7 @@ let
25492574 meta.platforms = stdenv.lib.platforms.unix;
25502575 }) {};
25512576
2552− xgc = callPackage ({ stdenv, libXaw, libXt }: stdenv.mkDerivation {
2577+ xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
25532578 name = "xgc-1.0.5";
25542579 builder = ./builder.sh;
25552580 src = fetchurl {
@@ -2562,7 +2587,7 @@ let
25622587 meta.platforms = stdenv.lib.platforms.unix;
25632588 }) {};
25642589
2565− xhost = callPackage ({ stdenv, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation {
2590+ xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation {
25662591 name = "xhost-1.0.7";
25672592 builder = ./builder.sh;
25682593 src = fetchurl {
@@ -2575,7 +2600,7 @@ let
25752600 meta.platforms = stdenv.lib.platforms.unix;
25762601 }) {};
25772602
2578− xineramaproto = callPackage ({ stdenv }: stdenv.mkDerivation {
2603+ xineramaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
25792604 name = "xineramaproto-1.2.1";
25802605 builder = ./builder.sh;
25812606 src = fetchurl {
@@ -2588,7 +2613,7 @@ let
25882613 meta.platforms = stdenv.lib.platforms.unix;
25892614 }) {};
25902615
2591− xinit = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2616+ xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
25922617 name = "xinit-1.4.0";
25932618 builder = ./builder.sh;
25942619 src = fetchurl {
@@ -2601,7 +2626,7 @@ let
26012626 meta.platforms = stdenv.lib.platforms.unix;
26022627 }) {};
26032628
2604− xinput = callPackage ({ stdenv, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation {
2629+ xinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation {
26052630 name = "xinput-1.6.2";
26062631 builder = ./builder.sh;
26072632 src = fetchurl {
@@ -2614,7 +2639,7 @@ let
26142639 meta.platforms = stdenv.lib.platforms.unix;
26152640 }) {};
26162641
2617− xkbcomp = callPackage ({ stdenv, libX11, libxkbfile, xproto }: stdenv.mkDerivation {
2642+ xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation {
26182643 name = "xkbcomp-1.4.2";
26192644 builder = ./builder.sh;
26202645 src = fetchurl {
@@ -2627,7 +2652,7 @@ let
26272652 meta.platforms = stdenv.lib.platforms.unix;
26282653 }) {};
26292654
2630− xkbevd = callPackage ({ stdenv, libX11, libxkbfile }: stdenv.mkDerivation {
2655+ xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation {
26312656 name = "xkbevd-1.1.4";
26322657 builder = ./builder.sh;
26332658 src = fetchurl {
@@ -2640,7 +2665,7 @@ let
26402665 meta.platforms = stdenv.lib.platforms.unix;
26412666 }) {};
26422667
2643− xkbprint = callPackage ({ stdenv, libX11, libxkbfile, xproto }: stdenv.mkDerivation {
2668+ xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation {
26442669 name = "xkbprint-1.0.4";
26452670 builder = ./builder.sh;
26462671 src = fetchurl {
@@ -2653,7 +2678,7 @@ let
26532678 meta.platforms = stdenv.lib.platforms.unix;
26542679 }) {};
26552680
2656− xkbutils = callPackage ({ stdenv, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation {
2681+ xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation {
26572682 name = "xkbutils-1.0.4";
26582683 builder = ./builder.sh;
26592684 src = fetchurl {
@@ -2666,7 +2691,7 @@ let
26662691 meta.platforms = stdenv.lib.platforms.unix;
26672692 }) {};
26682693
2669− xkeyboardconfig = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2694+ xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
26702695 name = "xkeyboard-config-2.24";
26712696 builder = ./builder.sh;
26722697 src = fetchurl {
@@ -2679,7 +2704,7 @@ let
26792704 meta.platforms = stdenv.lib.platforms.unix;
26802705 }) {};
26812706
2682− xkill = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation {
2707+ xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation {
26832708 name = "xkill-1.0.4";
26842709 builder = ./builder.sh;
26852710 src = fetchurl {
@@ -2692,7 +2717,7 @@ let
26922717 meta.platforms = stdenv.lib.platforms.unix;
26932718 }) {};
26942719
2695− xlsatoms = callPackage ({ stdenv, libxcb }: stdenv.mkDerivation {
2720+ xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation {
26962721 name = "xlsatoms-1.1.2";
26972722 builder = ./builder.sh;
26982723 src = fetchurl {
@@ -2705,7 +2730,7 @@ let
27052730 meta.platforms = stdenv.lib.platforms.unix;
27062731 }) {};
27072732
2708− xlsclients = callPackage ({ stdenv, libxcb }: stdenv.mkDerivation {
2733+ xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation {
27092734 name = "xlsclients-1.1.3";
27102735 builder = ./builder.sh;
27112736 src = fetchurl {
@@ -2718,7 +2743,7 @@ let
27182743 meta.platforms = stdenv.lib.platforms.unix;
27192744 }) {};
27202745
2721− xlsfonts = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2746+ xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
27222747 name = "xlsfonts-1.0.5";
27232748 builder = ./builder.sh;
27242749 src = fetchurl {
@@ -2731,7 +2756,7 @@ let
27312756 meta.platforms = stdenv.lib.platforms.unix;
27322757 }) {};
27332758
2734− xmag = callPackage ({ stdenv, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
2759+ xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
27352760 name = "xmag-1.0.6";
27362761 builder = ./builder.sh;
27372762 src = fetchurl {
@@ -2744,7 +2769,7 @@ let
27442769 meta.platforms = stdenv.lib.platforms.unix;
27452770 }) {};
27462771
2747− xmessage = callPackage ({ stdenv, libXaw, libXt }: stdenv.mkDerivation {
2772+ xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
27482773 name = "xmessage-1.0.4";
27492774 builder = ./builder.sh;
27502775 src = fetchurl {
@@ -2757,7 +2782,7 @@ let
27572782 meta.platforms = stdenv.lib.platforms.unix;
27582783 }) {};
27592784
2760− xmodmap = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2785+ xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
27612786 name = "xmodmap-1.0.9";
27622787 builder = ./builder.sh;
27632788 src = fetchurl {
@@ -2770,7 +2795,7 @@ let
27702795 meta.platforms = stdenv.lib.platforms.unix;
27712796 }) {};
27722797
2773− xorgcffiles = callPackage ({ stdenv }: stdenv.mkDerivation {
2798+ xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
27742799 name = "xorg-cf-files-1.0.6";
27752800 builder = ./builder.sh;
27762801 src = fetchurl {
@@ -2783,7 +2808,7 @@ let
27832808 meta.platforms = stdenv.lib.platforms.unix;
27842809 }) {};
27852810
2786− xorgdocs = callPackage ({ stdenv }: stdenv.mkDerivation {
2811+ xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
27872812 name = "xorg-docs-1.7.1";
27882813 builder = ./builder.sh;
27892814 src = fetchurl {
@@ -2796,7 +2821,7 @@ let
27962821 meta.platforms = stdenv.lib.platforms.unix;
27972822 }) {};
27982823
2799− xorgserver = callPackage ({ stdenv, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
2824+ xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
28002825 name = "xorg-server-1.19.6";
28012826 builder = ./builder.sh;
28022827 src = fetchurl {
@@ -2809,7 +2834,7 @@ let
28092834 meta.platforms = stdenv.lib.platforms.unix;
28102835 }) {};
28112836
2812− xorgsgmldoctools = callPackage ({ stdenv }: stdenv.mkDerivation {
2837+ xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
28132838 name = "xorg-sgml-doctools-1.11";
28142839 builder = ./builder.sh;
28152840 src = fetchurl {
@@ -2822,7 +2847,7 @@ let
28222847 meta.platforms = stdenv.lib.platforms.unix;
28232848 }) {};
28242849
2825− xpr = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation {
2850+ xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation {
28262851 name = "xpr-1.0.4";
28272852 builder = ./builder.sh;
28282853 src = fetchurl {
@@ -2835,7 +2860,7 @@ let
28352860 meta.platforms = stdenv.lib.platforms.unix;
28362861 }) {};
28372862
2838− xprop = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2863+ xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
28392864 name = "xprop-1.2.2";
28402865 builder = ./builder.sh;
28412866 src = fetchurl {
@@ -2848,7 +2873,7 @@ let
28482873 meta.platforms = stdenv.lib.platforms.unix;
28492874 }) {};
28502875
2851− xproto = callPackage ({ stdenv }: stdenv.mkDerivation {
2876+ xproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
28522877 name = "xproto-7.0.31";
28532878 builder = ./builder.sh;
28542879 src = fetchurl {
@@ -2861,7 +2886,7 @@ let
28612886 meta.platforms = stdenv.lib.platforms.unix;
28622887 }) {};
28632888
2864− xrandr = callPackage ({ stdenv, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation {
2889+ xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation {
28652890 name = "xrandr-1.5.0";
28662891 builder = ./builder.sh;
28672892 src = fetchurl {
@@ -2874,7 +2899,7 @@ let
28742899 meta.platforms = stdenv.lib.platforms.unix;
28752900 }) {};
28762901
2877− xrdb = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation {
2902+ xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation {
28782903 name = "xrdb-1.1.0";
28792904 builder = ./builder.sh;
28802905 src = fetchurl {
@@ -2887,7 +2912,7 @@ let
28872912 meta.platforms = stdenv.lib.platforms.unix;
28882913 }) {};
28892914
2890− xrefresh = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2915+ xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
28912916 name = "xrefresh-1.0.5";
28922917 builder = ./builder.sh;
28932918 src = fetchurl {
@@ -2900,7 +2925,7 @@ let
29002925 meta.platforms = stdenv.lib.platforms.unix;
29012926 }) {};
29022927
2903− xset = callPackage ({ stdenv, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation {
2928+ xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation {
29042929 name = "xset-1.2.3";
29052930 builder = ./builder.sh;
29062931 src = fetchurl {
@@ -2913,7 +2938,7 @@ let
29132938 meta.platforms = stdenv.lib.platforms.unix;
29142939 }) {};
29152940
2916− xsetroot = callPackage ({ stdenv, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation {
2941+ xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation {
29172942 name = "xsetroot-1.1.0";
29182943 builder = ./builder.sh;
29192944 src = fetchurl {
@@ -2926,7 +2951,7 @@ let
29262951 meta.platforms = stdenv.lib.platforms.unix;
29272952 }) {};
29282953
2929− xtrans = callPackage ({ stdenv }: stdenv.mkDerivation {
2954+ xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
29302955 name = "xtrans-1.3.5";
29312956 builder = ./builder.sh;
29322957 src = fetchurl {
@@ -2939,7 +2964,7 @@ let
29392964 meta.platforms = stdenv.lib.platforms.unix;
29402965 }) {};
29412966
2942− xvinfo = callPackage ({ stdenv, libX11, xproto, libXv }: stdenv.mkDerivation {
2967+ xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXv }: stdenv.mkDerivation {
29432968 name = "xvinfo-1.1.3";
29442969 builder = ./builder.sh;
29452970 src = fetchurl {
@@ -2952,7 +2977,7 @@ let
29522977 meta.platforms = stdenv.lib.platforms.unix;
29532978 }) {};
29542979
2955− xwd = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
2980+ xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
29562981 name = "xwd-1.0.6";
29572982 builder = ./builder.sh;
29582983 src = fetchurl {
@@ -2965,7 +2990,7 @@ let
29652990 meta.platforms = stdenv.lib.platforms.unix;
29662991 }) {};
29672992
2968− xwininfo = callPackage ({ stdenv, libX11, libxcb, xproto }: stdenv.mkDerivation {
2993+ xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xproto }: stdenv.mkDerivation {
29692994 name = "xwininfo-1.1.3";
29702995 builder = ./builder.sh;
29712996 src = fetchurl {
@@ -2978,7 +3003,7 @@ let
29783003 meta.platforms = stdenv.lib.platforms.unix;
29793004 }) {};
29803005
2981− xwud = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation {
3006+ xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
29823007 name = "xwud-1.0.4";
29833008 builder = ./builder.sh;
29843009 src = fetchurl {
@@ -2991,4 +3016,4 @@ let
29913016 meta.platforms = stdenv.lib.platforms.unix;
29923017 }) {};
29933018
2994−}; in xorg.overrideScope overrides
3019+})