From 8c8197dfb3f22c62da68454790d9b0ab6b991c9b Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 16:14:37 +0200
Subject: xorg: stop using the new nix syntax

Partial revert of 5ea8497933da0dbee5fa5a31c97843e2c6baac17.
---
 pkgs/servers/x11/xorg/default.nix                  | 849 ++++++++++-----------
 .../x11/xorg/generate-expr-from-tarballs.pl        |   9 +-
 2 files changed, 424 insertions(+), 434 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 519ea6a2f7a1..81988e45db07 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,18 +3,13 @@ args: with args;
 
 let
 
-  mkDerivation = name: attrs:
-    let newAttrs = (overrides."${name}" or (x: x)) attrs;
-        stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
-
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
 
   inherit pixman;
 
-  applewmproto = (mkDerivation "applewmproto" {
+  applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
     name = "applewmproto-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -22,9 +17,9 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  bdftopcf = (mkDerivation "bdftopcf" {
+  bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) {
     name = "bdftopcf-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -32,9 +27,9 @@ let
       sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga";
     };
     buildInputs = [pkgconfig libXfont ];
-  }) // {inherit libXfont ;};
+  })) // {inherit libXfont ;};
 
-  bigreqsproto = (mkDerivation "bigreqsproto" {
+  bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) {
     name = "bigreqsproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -42,9 +37,9 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  compositeproto = (mkDerivation "compositeproto" {
+  compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) {
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -52,9 +47,9 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  damageproto = (mkDerivation "damageproto" {
+  damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) {
     name = "damageproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -62,9 +57,9 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dmxproto = (mkDerivation "dmxproto" {
+  dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) {
     name = "dmxproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -72,9 +67,9 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dri2proto = (mkDerivation "dri2proto" {
+  dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
     name = "dri2proto-2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -82,9 +77,9 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dri3proto = (mkDerivation "dri3proto" {
+  dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) {
     name = "dri3proto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -92,9 +87,9 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  encodings = (mkDerivation "encodings" {
+  encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) {
     name = "encodings-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -102,9 +97,9 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fixesproto = (mkDerivation "fixesproto" {
+  fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) {
     name = "fixesproto-5.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -112,9 +107,9 @@ let
       sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
-  }) // {inherit xextproto ;};
+  })) // {inherit xextproto ;};
 
-  fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
+  fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) {
     name = "font-adobe-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -122,9 +117,9 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
+  fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) {
     name = "font-adobe-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -132,9 +127,9 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
+  fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) {
     name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -142,9 +137,9 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
+  fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) {
     name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -152,9 +147,9 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
+  fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) {
     name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -162,9 +157,9 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontalias = (mkDerivation "fontalias" {
+  fontalias = (stdenv.mkDerivation ((if overrides ? fontalias then overrides.fontalias else x: x) {
     name = "font-alias-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -172,9 +167,9 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontarabicmisc = (mkDerivation "fontarabicmisc" {
+  fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) {
     name = "font-arabic-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -182,9 +177,9 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbh100dpi = (mkDerivation "fontbh100dpi" {
+  fontbh100dpi = (stdenv.mkDerivation ((if overrides ? fontbh100dpi then overrides.fontbh100dpi else x: x) {
     name = "font-bh-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -192,9 +187,9 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbh75dpi = (mkDerivation "fontbh75dpi" {
+  fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) {
     name = "font-bh-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -202,9 +197,9 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
+  fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) {
     name = "font-bh-lucidatypewriter-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -212,9 +207,9 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
+  fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) {
     name = "font-bh-lucidatypewriter-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -222,9 +217,9 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhttf = (mkDerivation "fontbhttf" {
+  fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) {
     name = "font-bh-ttf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -232,9 +227,9 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontbhtype1 = (mkDerivation "fontbhtype1" {
+  fontbhtype1 = (stdenv.mkDerivation ((if overrides ? fontbhtype1 then overrides.fontbhtype1 else x: x) {
     name = "font-bh-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -242,9 +237,9 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
+  fontbitstream100dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream100dpi then overrides.fontbitstream100dpi else x: x) {
     name = "font-bitstream-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -252,9 +247,9 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
+  fontbitstream75dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream75dpi then overrides.fontbitstream75dpi else x: x) {
     name = "font-bitstream-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -262,9 +257,9 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
+  fontbitstreamtype1 = (stdenv.mkDerivation ((if overrides ? fontbitstreamtype1 then overrides.fontbitstreamtype1 else x: x) {
     name = "font-bitstream-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -272,9 +267,9 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
+  fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) {
     name = "font-cronyx-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -282,9 +277,9 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontcursormisc = (mkDerivation "fontcursormisc" {
+  fontcursormisc = (stdenv.mkDerivation ((if overrides ? fontcursormisc then overrides.fontcursormisc else x: x) {
     name = "font-cursor-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -292,9 +287,9 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
+  fontdaewoomisc = (stdenv.mkDerivation ((if overrides ? fontdaewoomisc then overrides.fontdaewoomisc else x: x) {
     name = "font-daewoo-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -302,9 +297,9 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontdecmisc = (mkDerivation "fontdecmisc" {
+  fontdecmisc = (stdenv.mkDerivation ((if overrides ? fontdecmisc then overrides.fontdecmisc else x: x) {
     name = "font-dec-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -312,9 +307,9 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontibmtype1 = (mkDerivation "fontibmtype1" {
+  fontibmtype1 = (stdenv.mkDerivation ((if overrides ? fontibmtype1 then overrides.fontibmtype1 else x: x) {
     name = "font-ibm-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -322,9 +317,9 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontisasmisc = (mkDerivation "fontisasmisc" {
+  fontisasmisc = (stdenv.mkDerivation ((if overrides ? fontisasmisc then overrides.fontisasmisc else x: x) {
     name = "font-isas-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -332,9 +327,9 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontjismisc = (mkDerivation "fontjismisc" {
+  fontjismisc = (stdenv.mkDerivation ((if overrides ? fontjismisc then overrides.fontjismisc else x: x) {
     name = "font-jis-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -342,9 +337,9 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmicromisc = (mkDerivation "fontmicromisc" {
+  fontmicromisc = (stdenv.mkDerivation ((if overrides ? fontmicromisc then overrides.fontmicromisc else x: x) {
     name = "font-micro-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -352,9 +347,9 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
+  fontmisccyrillic = (stdenv.mkDerivation ((if overrides ? fontmisccyrillic then overrides.fontmisccyrillic else x: x) {
     name = "font-misc-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -362,9 +357,9 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
+  fontmiscethiopic = (stdenv.mkDerivation ((if overrides ? fontmiscethiopic then overrides.fontmiscethiopic else x: x) {
     name = "font-misc-ethiopic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -372,9 +367,9 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
+  fontmiscmeltho = (stdenv.mkDerivation ((if overrides ? fontmiscmeltho then overrides.fontmiscmeltho else x: x) {
     name = "font-misc-meltho-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -382,9 +377,9 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmisc = (mkDerivation "fontmiscmisc" {
+  fontmiscmisc = (stdenv.mkDerivation ((if overrides ? fontmiscmisc then overrides.fontmiscmisc else x: x) {
     name = "font-misc-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -392,9 +387,9 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontmuttmisc = (mkDerivation "fontmuttmisc" {
+  fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) {
     name = "font-mutt-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -402,9 +397,9 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontschumachermisc = (mkDerivation "fontschumachermisc" {
+  fontschumachermisc = (stdenv.mkDerivation ((if overrides ? fontschumachermisc then overrides.fontschumachermisc else x: x) {
     name = "font-schumacher-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -412,9 +407,9 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
+  fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) {
     name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -422,9 +417,9 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontsonymisc = (mkDerivation "fontsonymisc" {
+  fontsonymisc = (stdenv.mkDerivation ((if overrides ? fontsonymisc then overrides.fontsonymisc else x: x) {
     name = "font-sony-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -432,9 +427,9 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontsproto = (mkDerivation "fontsproto" {
+  fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
     name = "fontsproto-2.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -442,9 +437,9 @@ let
       sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontsunmisc = (mkDerivation "fontsunmisc" {
+  fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) {
     name = "font-sun-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -452,9 +447,9 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontutil = (mkDerivation "fontutil" {
+  fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) {
     name = "font-util-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -462,9 +457,9 @@ let
       sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
+  fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) {
     name = "font-winitzki-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -472,9 +467,9 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontxfree86type1 = (mkDerivation "fontxfree86type1" {
+  fontxfree86type1 = (stdenv.mkDerivation ((if overrides ? fontxfree86type1 then overrides.fontxfree86type1 else x: x) {
     name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -482,9 +477,9 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  gccmakedep = (mkDerivation "gccmakedep" {
+  gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) {
     name = "gccmakedep-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -492,9 +487,9 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  glamoregl = (mkDerivation "glamoregl" {
+  glamoregl = (stdenv.mkDerivation ((if overrides ? glamoregl then overrides.glamoregl else x: x) {
     name = "glamor-egl-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -502,9 +497,9 @@ let
       sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
     };
     buildInputs = [pkgconfig dri2proto xorgserver ];
-  }) // {inherit dri2proto xorgserver ;};
+  })) // {inherit dri2proto xorgserver ;};
 
-  glproto = (mkDerivation "glproto" {
+  glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
     name = "glproto-1.4.17";
     builder = ./builder.sh;
     src = fetchurl {
@@ -512,9 +507,9 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  iceauth = (mkDerivation "iceauth" {
+  iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
     name = "iceauth-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -522,9 +517,9 @@ let
       sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx";
     };
     buildInputs = [pkgconfig libICE xproto ];
-  }) // {inherit libICE xproto ;};
+  })) // {inherit libICE xproto ;};
 
-  imake = (mkDerivation "imake" {
+  imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
     name = "imake-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -532,9 +527,9 @@ let
       sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  inputproto = (mkDerivation "inputproto" {
+  inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
     name = "inputproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -542,9 +537,9 @@ let
       sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  kbproto = (mkDerivation "kbproto" {
+  kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) {
     name = "kbproto-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -552,9 +547,9 @@ let
       sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  libAppleWM = (mkDerivation "libAppleWM" {
+  libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) {
     name = "libAppleWM-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -562,9 +557,9 @@ let
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
-  }) // {inherit applewmproto libX11 libXext xextproto ;};
+  })) // {inherit applewmproto libX11 libXext xextproto ;};
 
-  libFS = (mkDerivation "libFS" {
+  libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
     name = "libFS-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -572,9 +567,9 @@ let
       sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
-  }) // {inherit fontsproto xproto xtrans ;};
+  })) // {inherit fontsproto xproto xtrans ;};
 
-  libICE = (mkDerivation "libICE" {
+  libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
     name = "libICE-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -582,9 +577,9 @@ let
       sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
-  }) // {inherit xproto xtrans ;};
+  })) // {inherit xproto xtrans ;};
 
-  libSM = (mkDerivation "libSM" {
+  libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
     name = "libSM-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -592,9 +587,9 @@ let
       sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
-  }) // {inherit libICE libuuid xproto xtrans ;};
+  })) // {inherit libICE libuuid xproto xtrans ;};
 
-  libWindowsWM = (mkDerivation "libWindowsWM" {
+  libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) {
     name = "libWindowsWM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -602,9 +597,9 @@ let
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
-  }) // {inherit windowswmproto libX11 libXext xextproto ;};
+  })) // {inherit windowswmproto libX11 libXext xextproto ;};
 
-  libX11 = (mkDerivation "libX11" {
+  libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
     name = "libX11-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -613,9 +608,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
-  }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
+  })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
-  libXScrnSaver = (mkDerivation "libXScrnSaver" {
+  libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) {
     name = "libXScrnSaver-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -623,9 +618,9 @@ let
       sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
-  }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
+  })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
-  libXau = (mkDerivation "libXau" {
+  libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
     name = "libXau-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -634,9 +629,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  libXaw = (mkDerivation "libXaw" {
+  libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
     name = "libXaw-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
@@ -644,9 +639,9 @@ let
       sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
-  }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
-  libXcomposite = (mkDerivation "libXcomposite" {
+  libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
     name = "libXcomposite-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -655,9 +650,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
-  }) // {inherit compositeproto libX11 libXfixes xproto ;};
+  })) // {inherit compositeproto libX11 libXfixes xproto ;};
 
-  libXcursor = (mkDerivation "libXcursor" {
+  libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
     name = "libXcursor-1.1.14";
     builder = ./builder.sh;
     src = fetchurl {
@@ -666,9 +661,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
-  }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
+  })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
-  libXdamage = (mkDerivation "libXdamage" {
+  libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
     name = "libXdamage-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -677,9 +672,9 @@ let
     };
     outputs = [ "dev" "out" ];
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
-  }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
+  })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
-  libXdmcp = (mkDerivation "libXdmcp" {
+  libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
     name = "libXdmcp-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -688,9 +683,9 @@ let
     };
     outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  libXext = (mkDerivation "libXext" {
+  libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
     name = "libXext-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -699,9 +694,9 @@ let
     };
     outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig libX11 xextproto xproto ];
-  }) // {inherit libX11 xextproto xproto ;};
+  })) // {inherit libX11 xextproto xproto ;};
 
-  libXfixes = (mkDerivation "libXfixes" {
+  libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
     name = "libXfixes-5.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -710,9 +705,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
-  }) // {inherit fixesproto libX11 xextproto xproto ;};
+  })) // {inherit fixesproto libX11 xextproto xproto ;};
 
-  libXfont = (mkDerivation "libXfont" {
+  libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
     name = "libXfont-1.4.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -720,9 +715,9 @@ let
       sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
-  }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
+  })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
-  libXft = (mkDerivation "libXft" {
+  libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
     name = "libXft-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -731,9 +726,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
-  }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
+  })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
-  libXi = (mkDerivation "libXi" {
+  libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
     name = "libXi-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -742,9 +737,9 @@ let
     };
     outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
-  }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
+  })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
-  libXinerama = (mkDerivation "libXinerama" {
+  libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
     name = "libXinerama-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -753,9 +748,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
-  }) // {inherit libX11 libXext xextproto xineramaproto ;};
+  })) // {inherit libX11 libXext xextproto xineramaproto ;};
 
-  libXmu = (mkDerivation "libXmu" {
+  libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
     name = "libXmu-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -763,9 +758,9 @@ let
       sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  }) // {inherit libX11 libXext xextproto xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXp = (mkDerivation "libXp" {
+  libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) {
     name = "libXp-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -773,9 +768,9 @@ let
       sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
-  }) // {inherit printproto libX11 libXau libXext xextproto ;};
+  })) // {inherit printproto libX11 libXau libXext xextproto ;};
 
-  libXpm = (mkDerivation "libXpm" {
+  libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
     name = "libXpm-3.5.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -783,9 +778,9 @@ let
       sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  }) // {inherit libX11 libXext xextproto xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXrandr = (mkDerivation "libXrandr" {
+  libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
     name = "libXrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -794,9 +789,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
-  }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
+  })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
-  libXrender = (mkDerivation "libXrender" {
+  libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
     name = "libXrender-0.9.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -805,9 +800,9 @@ let
     };
     outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig renderproto libX11 xproto ];
-  }) // {inherit renderproto libX11 xproto ;};
+  })) // {inherit renderproto libX11 xproto ;};
 
-  libXres = (mkDerivation "libXres" {
+  libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) {
     name = "libXres-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -815,9 +810,9 @@ let
       sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
-  }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
+  })) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
-  libXt = (mkDerivation "libXt" {
+  libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
     name = "libXt-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -825,9 +820,9 @@ let
       sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
-  }) // {inherit libICE kbproto libSM libX11 xproto ;};
+  })) // {inherit libICE kbproto libSM libX11 xproto ;};
 
-  libXtst = (mkDerivation "libXtst" {
+  libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) {
     name = "libXtst-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -835,9 +830,9 @@ let
       sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
-  }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
+  })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
-  libXv = (mkDerivation "libXv" {
+  libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
     name = "libXv-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -845,9 +840,9 @@ let
       sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
-  }) // {inherit videoproto libX11 libXext xextproto xproto ;};
+  })) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
-  libXvMC = (mkDerivation "libXvMC" {
+  libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) {
     name = "libXvMC-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -855,9 +850,9 @@ let
       sha256 = "015jk3bxfmj6zaw99x282f9npi8qqaw34yg186frags3z8g406jy";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
-  }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
+  })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
 
-  libXxf86dga = (mkDerivation "libXxf86dga" {
+  libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) {
     name = "libXxf86dga-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -865,9 +860,9 @@ let
       sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
 
-  libXxf86misc = (mkDerivation "libXxf86misc" {
+  libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) {
     name = "libXxf86misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -875,9 +870,9 @@ let
       sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
-  libXxf86vm = (mkDerivation "libXxf86vm" {
+  libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
     name = "libXxf86vm-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -886,9 +881,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
-  libdmx = (mkDerivation "libdmx" {
+  libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) {
     name = "libdmx-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -896,9 +891,9 @@ let
       sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
-  }) // {inherit dmxproto libX11 libXext xextproto ;};
+  })) // {inherit dmxproto libX11 libXext xextproto ;};
 
-  libfontenc = (mkDerivation "libfontenc" {
+  libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
     name = "libfontenc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -906,9 +901,9 @@ let
       sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959";
     };
     buildInputs = [pkgconfig xproto zlib ];
-  }) // {inherit xproto zlib ;};
+  })) // {inherit xproto zlib ;};
 
-  libpciaccess = (mkDerivation "libpciaccess" {
+  libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
     name = "libpciaccess-0.13.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -916,9 +911,9 @@ let
       sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb";
     };
     buildInputs = [pkgconfig zlib ];
-  }) // {inherit zlib ;};
+  })) // {inherit zlib ;};
 
-  libpthreadstubs = (mkDerivation "libpthreadstubs" {
+  libpthreadstubs = (stdenv.mkDerivation ((if overrides ? libpthreadstubs then overrides.libpthreadstubs else x: x) {
     name = "libpthread-stubs-0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -926,9 +921,9 @@ let
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  libxcb = (mkDerivation "libxcb" {
+  libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
     name = "libxcb-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -937,9 +932,9 @@ let
     };
     outputs = [ "dev" "out" "doc" "man" ];
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
-  }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
+  })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
-  libxkbfile = (mkDerivation "libxkbfile" {
+  libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) {
     name = "libxkbfile-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -947,9 +942,9 @@ let
       sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
-  }) // {inherit kbproto libX11 ;};
+  })) // {inherit kbproto libX11 ;};
 
-  libxshmfence = (mkDerivation "libxshmfence" {
+  libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) {
     name = "libxshmfence-1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -957,9 +952,9 @@ let
       sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  lndir = (mkDerivation "lndir" {
+  lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
     name = "lndir-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -967,9 +962,9 @@ let
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  luit = (mkDerivation "luit" {
+  luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) {
     name = "luit-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -977,9 +972,9 @@ let
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
     buildInputs = [pkgconfig libfontenc ];
-  }) // {inherit libfontenc ;};
+  })) // {inherit libfontenc ;};
 
-  makedepend = (mkDerivation "makedepend" {
+  makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
     name = "makedepend-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -987,9 +982,9 @@ let
       sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  mkfontdir = (mkDerivation "mkfontdir" {
+  mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) {
     name = "mkfontdir-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -997,9 +992,9 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  mkfontscale = (mkDerivation "mkfontscale" {
+  mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
     name = "mkfontscale-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1007,9 +1002,9 @@ let
       sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
-  }) // {inherit libfontenc freetype xproto zlib ;};
+  })) // {inherit libfontenc freetype xproto zlib ;};
 
-  presentproto = (mkDerivation "presentproto" {
+  presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) {
     name = "presentproto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1017,9 +1012,9 @@ let
       sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  printproto = (mkDerivation "printproto" {
+  printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
     name = "printproto-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1027,9 +1022,9 @@ let
       sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
     };
     buildInputs = [pkgconfig libXau ];
-  }) // {inherit libXau ;};
+  })) // {inherit libXau ;};
 
-  randrproto = (mkDerivation "randrproto" {
+  randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) {
     name = "randrproto-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1037,9 +1032,9 @@ let
       sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  recordproto = (mkDerivation "recordproto" {
+  recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) {
     name = "recordproto-1.14.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1047,9 +1042,9 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  renderproto = (mkDerivation "renderproto" {
+  renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) {
     name = "renderproto-0.11.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1057,9 +1052,9 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  resourceproto = (mkDerivation "resourceproto" {
+  resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) {
     name = "resourceproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1067,9 +1062,9 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  scrnsaverproto = (mkDerivation "scrnsaverproto" {
+  scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) {
     name = "scrnsaverproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1077,9 +1072,9 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  sessreg = (mkDerivation "sessreg" {
+  sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
     name = "sessreg-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1087,9 +1082,9 @@ let
       sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  setxkbmap = (mkDerivation "setxkbmap" {
+  setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) {
     name = "setxkbmap-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1097,9 +1092,9 @@ let
       sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  smproxy = (mkDerivation "smproxy" {
+  smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) {
     name = "smproxy-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1107,9 +1102,9 @@ let
       sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
-  }) // {inherit libICE libSM libXmu libXt ;};
+  })) // {inherit libICE libSM libXmu libXt ;};
 
-  twm = (mkDerivation "twm" {
+  twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
     name = "twm-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1117,9 +1112,9 @@ let
       sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
-  }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
+  })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
-  utilmacros = (mkDerivation "utilmacros" {
+  utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
     name = "util-macros-1.19.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1127,9 +1122,9 @@ let
       sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  videoproto = (mkDerivation "videoproto" {
+  videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) {
     name = "videoproto-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1137,9 +1132,9 @@ let
       sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  windowswmproto = (mkDerivation "windowswmproto" {
+  windowswmproto = (stdenv.mkDerivation ((if overrides ? windowswmproto then overrides.windowswmproto else x: x) {
     name = "windowswmproto-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1147,9 +1142,9 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  x11perf = (mkDerivation "x11perf" {
+  x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) {
     name = "x11perf-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1157,9 +1152,9 @@ let
       sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
-  }) // {inherit libX11 libXext libXft libXmu libXrender ;};
+  })) // {inherit libX11 libXext libXft libXmu libXrender ;};
 
-  xauth = (mkDerivation "xauth" {
+  xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
     name = "xauth-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1167,9 +1162,9 @@ let
       sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
-  }) // {inherit libX11 libXau libXext libXmu xproto ;};
+  })) // {inherit libX11 libXau libXext libXmu xproto ;};
 
-  xbacklight = (mkDerivation "xbacklight" {
+  xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) {
     name = "xbacklight-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1177,9 +1172,9 @@ let
       sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
-  }) // {inherit libxcb xcbutil ;};
+  })) // {inherit libxcb xcbutil ;};
 
-  xbitmaps = (mkDerivation "xbitmaps" {
+  xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) {
     name = "xbitmaps-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1187,9 +1182,9 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xcbproto = (mkDerivation "xcbproto" {
+  xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
     name = "xcb-proto-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1197,9 +1192,9 @@ let
       sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
     };
     buildInputs = [pkgconfig python ];
-  }) // {inherit python ;};
+  })) // {inherit python ;};
 
-  xcbutil = (mkDerivation "xcbutil" {
+  xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
     name = "xcb-util-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1207,9 +1202,9 @@ let
       sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilimage = (mkDerivation "xcbutilimage" {
+  xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
     name = "xcb-util-image-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1217,9 +1212,9 @@ let
       sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
-  }) // {inherit gperf m4 libxcb xcbutil xproto ;};
+  })) // {inherit gperf m4 libxcb xcbutil xproto ;};
 
-  xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
+  xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
     name = "xcb-util-keysyms-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1227,9 +1222,9 @@ let
       sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
+  xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
     name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1237,9 +1232,9 @@ let
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilwm = (mkDerivation "xcbutilwm" {
+  xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
     name = "xcb-util-wm-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1247,9 +1242,9 @@ let
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xclock = (mkDerivation "xclock" {
+  xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
     name = "xclock-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1257,9 +1252,9 @@ let
       sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
-  }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
+  })) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
-  xcmiscproto = (mkDerivation "xcmiscproto" {
+  xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
     name = "xcmiscproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1267,9 +1262,9 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xcmsdb = (mkDerivation "xcmsdb" {
+  xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) {
     name = "xcmsdb-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1277,9 +1272,9 @@ let
       sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
     };
     buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
+  })) // {inherit libX11 ;};
 
-  xcursorgen = (mkDerivation "xcursorgen" {
+  xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
     name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1287,9 +1282,9 @@ let
       sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
-  }) // {inherit libpng libX11 libXcursor ;};
+  })) // {inherit libpng libX11 libXcursor ;};
 
-  xcursorthemes = (mkDerivation "xcursorthemes" {
+  xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) {
     name = "xcursor-themes-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1297,9 +1292,9 @@ let
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
-  }) // {inherit libXcursor ;};
+  })) // {inherit libXcursor ;};
 
-  xdm = (mkDerivation "xdm" {
+  xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) {
     name = "xdm-1.1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1307,9 +1302,9 @@ let
       sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
-  }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
+  })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
-  xdpyinfo = (mkDerivation "xdpyinfo" {
+  xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
     name = "xdpyinfo-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1317,9 +1312,9 @@ let
       sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
-  xdriinfo = (mkDerivation "xdriinfo" {
+  xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
     name = "xdriinfo-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1327,9 +1322,9 @@ let
       sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
     };
     buildInputs = [pkgconfig glproto libX11 ];
-  }) // {inherit glproto libX11 ;};
+  })) // {inherit glproto libX11 ;};
 
-  xev = (mkDerivation "xev" {
+  xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
     name = "xev-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1337,9 +1332,9 @@ let
       sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
-  }) // {inherit libX11 xproto libXrandr ;};
+  })) // {inherit libX11 xproto libXrandr ;};
 
-  xextproto = (mkDerivation "xextproto" {
+  xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
     name = "xextproto-7.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1347,9 +1342,9 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xeyes = (mkDerivation "xeyes" {
+  xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) {
     name = "xeyes-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1357,9 +1352,9 @@ let
       sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
-  }) // {inherit libX11 libXext libXmu libXrender libXt ;};
+  })) // {inherit libX11 libXext libXmu libXrender libXt ;};
 
-  xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
+  xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) {
     name = "xf86bigfontproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1367,9 +1362,9 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86dgaproto = (mkDerivation "xf86dgaproto" {
+  xf86dgaproto = (stdenv.mkDerivation ((if overrides ? xf86dgaproto then overrides.xf86dgaproto else x: x) {
     name = "xf86dgaproto-2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1377,9 +1372,9 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86driproto = (mkDerivation "xf86driproto" {
+  xf86driproto = (stdenv.mkDerivation ((if overrides ? xf86driproto then overrides.xf86driproto else x: x) {
     name = "xf86driproto-2.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1387,9 +1382,9 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86inputevdev = (mkDerivation "xf86inputevdev" {
+  xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
     name = "xf86-input-evdev-2.8.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1397,9 +1392,9 @@ let
       sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
-  }) // {inherit inputproto udev xorgserver xproto ;};
+  })) // {inherit inputproto udev xorgserver xproto ;};
 
-  xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
+  xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
     name = "xf86-input-joystick-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1407,9 +1402,9 @@ let
       sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
-  }) // {inherit inputproto kbproto xorgserver xproto ;};
+  })) // {inherit inputproto kbproto xorgserver xproto ;};
 
-  xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
+  xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
     name = "xf86-input-keyboard-1.8.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1417,9 +1412,9 @@ let
       sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  }) // {inherit inputproto xorgserver xproto ;};
+  })) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputmouse = (mkDerivation "xf86inputmouse" {
+  xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
     name = "xf86-input-mouse-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1427,9 +1422,9 @@ let
       sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  }) // {inherit inputproto xorgserver xproto ;};
+  })) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
+  xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
     name = "xf86-input-synaptics-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1437,9 +1432,9 @@ let
       sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
-  }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
+  })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
-  xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
+  xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
     name = "xf86-input-vmmouse-13.0.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1447,9 +1442,9 @@ let
       sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
+  })) // {inherit inputproto randrproto xorgserver xproto ;};
 
-  xf86inputvoid = (mkDerivation "xf86inputvoid" {
+  xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) {
     name = "xf86-input-void-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1457,9 +1452,9 @@ let
       sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  }) // {inherit xorgserver xproto ;};
+  })) // {inherit xorgserver xproto ;};
 
-  xf86miscproto = (mkDerivation "xf86miscproto" {
+  xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) {
     name = "xf86miscproto-0.9.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1467,9 +1462,9 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86videoark = (mkDerivation "xf86videoark" {
+  xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
     name = "xf86-video-ark-0.7.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1477,9 +1472,9 @@ let
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
-  xf86videoast = (mkDerivation "xf86videoast" {
+  xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
     name = "xf86-video-ast-0.98.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1487,9 +1482,9 @@ let
       sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoati = (mkDerivation "xf86videoati" {
+  xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
     name = "xf86-video-ati-7.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1497,9 +1492,9 @@ let
       sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videocirrus = (mkDerivation "xf86videocirrus" {
+  xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
     name = "xf86-video-cirrus-1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1507,9 +1502,9 @@ let
       sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videodummy = (mkDerivation "xf86videodummy" {
+  xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
     name = "xf86-video-dummy-0.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1517,9 +1512,9 @@ let
       sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videofbdev = (mkDerivation "xf86videofbdev" {
+  xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) {
     name = "xf86-video-fbdev-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1527,9 +1522,9 @@ let
       sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videogeode = (mkDerivation "xf86videogeode" {
+  xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
     name = "xf86-video-geode-2.11.16";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1537,9 +1532,9 @@ let
       sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoglide = (mkDerivation "xf86videoglide" {
+  xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
     name = "xf86-video-glide-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1547,9 +1542,9 @@ let
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
-  }) // {inherit xextproto xorgserver xproto ;};
+  })) // {inherit xextproto xorgserver xproto ;};
 
-  xf86videoglint = (mkDerivation "xf86videoglint" {
+  xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
     name = "xf86-video-glint-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1557,9 +1552,9 @@ let
       sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videoi128 = (mkDerivation "xf86videoi128" {
+  xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
     name = "xf86-video-i128-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1567,9 +1562,9 @@ let
       sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videointel = (mkDerivation "xf86videointel" {
+  xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
     name = "xf86-video-intel-2.21.15";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1577,9 +1572,9 @@ let
       sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
     };
     buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
-  }) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
+  })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
 
-  xf86videomach64 = (mkDerivation "xf86videomach64" {
+  xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.9.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1587,9 +1582,9 @@ let
       sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomga = (mkDerivation "xf86videomga" {
+  xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
     name = "xf86-video-mga-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1597,9 +1592,9 @@ let
       sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomodesetting = (mkDerivation "xf86videomodesetting" {
+  xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
     name = "xf86-video-modesetting-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1607,9 +1602,9 @@ let
       sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
-  xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
+  xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
     name = "xf86-video-neomagic-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1617,9 +1612,9 @@ let
       sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess xorgserver xproto ;};
 
-  xf86videonewport = (mkDerivation "xf86videonewport" {
+  xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) {
     name = "xf86-video-newport-0.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1627,9 +1622,9 @@ let
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videonouveau = (mkDerivation "xf86videonouveau" {
+  xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) {
     name = "xf86-video-nouveau-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1637,9 +1632,9 @@ let
       sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videonv = (mkDerivation "xf86videonv" {
+  xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
     name = "xf86-video-nv-2.1.20";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1647,9 +1642,9 @@ let
       sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
+  xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
     name = "xf86-video-openchrome-0.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1657,9 +1652,9 @@ let
       sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
-  }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
+  })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
-  xf86videor128 = (mkDerivation "xf86videor128" {
+  xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
     name = "xf86-video-r128-6.9.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1667,9 +1662,9 @@ let
       sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
-  xf86videosavage = (mkDerivation "xf86videosavage" {
+  xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
     name = "xf86-video-savage-2.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1677,9 +1672,9 @@ let
       sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
+  xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
     name = "xf86-video-siliconmotion-1.7.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1687,9 +1682,9 @@ let
       sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
-  xf86videosis = (mkDerivation "xf86videosis" {
+  xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
     name = "xf86-video-sis-0.10.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1697,9 +1692,9 @@ let
       sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
-  xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
+  xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1707,9 +1702,9 @@ let
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
 
-  xf86videosunffb = (mkDerivation "xf86videosunffb" {
+  xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) {
     name = "xf86-video-sunffb-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1717,9 +1712,9 @@ let
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videotdfx = (mkDerivation "xf86videotdfx" {
+  xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
     name = "xf86-video-tdfx-1.4.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1727,9 +1722,9 @@ let
       sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videotga = (mkDerivation "xf86videotga" {
+  xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) {
     name = "xf86-video-tga-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1737,9 +1732,9 @@ let
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videotrident = (mkDerivation "xf86videotrident" {
+  xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
     name = "xf86-video-trident-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1747,9 +1742,9 @@ let
       sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videov4l = (mkDerivation "xf86videov4l" {
+  xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) {
     name = "xf86-video-v4l-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1757,9 +1752,9 @@ let
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
-  }) // {inherit randrproto videoproto xorgserver xproto ;};
+  })) // {inherit randrproto videoproto xorgserver xproto ;};
 
-  xf86videovesa = (mkDerivation "xf86videovesa" {
+  xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) {
     name = "xf86-video-vesa-2.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1767,9 +1762,9 @@ let
       sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videovmware = (mkDerivation "xf86videovmware" {
+  xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
     name = "xf86-video-vmware-13.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1777,9 +1772,9 @@ let
       sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
 
-  xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
+  xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
     name = "xf86-video-voodoo-1.2.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1787,9 +1782,9 @@ let
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videowsfb = (mkDerivation "xf86videowsfb" {
+  xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) {
     name = "xf86-video-wsfb-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1797,9 +1792,9 @@ let
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  }) // {inherit xorgserver xproto ;};
+  })) // {inherit xorgserver xproto ;};
 
-  xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
+  xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) {
     name = "xf86vidmodeproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1807,9 +1802,9 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xfs = (mkDerivation "xfs" {
+  xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
     name = "xfs-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1817,9 +1812,9 @@ let
       sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v";
     };
     buildInputs = [pkgconfig libXfont xproto xtrans ];
-  }) // {inherit libXfont xproto xtrans ;};
+  })) // {inherit libXfont xproto xtrans ;};
 
-  xgamma = (mkDerivation "xgamma" {
+  xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) {
     name = "xgamma-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1827,9 +1822,9 @@ let
       sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
-  }) // {inherit libX11 libXxf86vm ;};
+  })) // {inherit libX11 libXxf86vm ;};
 
-  xhost = (mkDerivation "xhost" {
+  xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
     name = "xhost-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1837,9 +1832,9 @@ let
       sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
-  }) // {inherit libX11 libXau libXmu xproto ;};
+  })) // {inherit libX11 libXau libXmu xproto ;};
 
-  xineramaproto = (mkDerivation "xineramaproto" {
+  xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) {
     name = "xineramaproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1847,9 +1842,9 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xinit = (mkDerivation "xinit" {
+  xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
     name = "xinit-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1857,9 +1852,9 @@ let
       sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xinput = (mkDerivation "xinput" {
+  xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
     name = "xinput-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1867,9 +1862,9 @@ let
       sha256 = "07w7zlpdhpwzzshg8q0y152cy3wl2fj7x1897glnp2la487jsqxp";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
-  }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
+  })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
 
-  xkbcomp = (mkDerivation "xkbcomp" {
+  xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
     name = "xkbcomp-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1877,9 +1872,9 @@ let
       sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
-  }) // {inherit libX11 libxkbfile xproto ;};
+  })) // {inherit libX11 libxkbfile xproto ;};
 
-  xkbevd = (mkDerivation "xkbevd" {
+  xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) {
     name = "xkbevd-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1887,9 +1882,9 @@ let
       sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  xkbprint = (mkDerivation "xkbprint" {
+  xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) {
     name = "xkbprint-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1897,9 +1892,9 @@ let
       sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  xkbutils = (mkDerivation "xkbutils" {
+  xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) {
     name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1907,9 +1902,9 @@ let
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
-  }) // {inherit inputproto libX11 libXaw xproto libXt ;};
+  })) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
-  xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
+  xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
     name = "xkeyboard-config-2.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1917,9 +1912,9 @@ let
       sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xkill = (mkDerivation "xkill" {
+  xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
     name = "xkill-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1927,9 +1922,9 @@ let
       sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xlsatoms = (mkDerivation "xlsatoms" {
+  xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
     name = "xlsatoms-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1937,9 +1932,9 @@ let
       sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
     };
     buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+  })) // {inherit libxcb ;};
 
-  xlsclients = (mkDerivation "xlsclients" {
+  xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
     name = "xlsclients-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1947,9 +1942,9 @@ let
       sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+  })) // {inherit libxcb ;};
 
-  xmessage = (mkDerivation "xmessage" {
+  xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
     name = "xmessage-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1957,9 +1952,9 @@ let
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
+  })) // {inherit libXaw libXt ;};
 
-  xmodmap = (mkDerivation "xmodmap" {
+  xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
     name = "xmodmap-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1967,9 +1962,9 @@ let
       sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xorgcffiles = (mkDerivation "xorgcffiles" {
+  xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
     name = "xorg-cf-files-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1977,9 +1972,9 @@ let
       sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xorgdocs = (mkDerivation "xorgdocs" {
+  xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) {
     name = "xorg-docs-1.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1987,9 +1982,9 @@ let
       sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xorgserver = (mkDerivation "xorgserver" {
+  xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
     name = "xorg-server-1.14.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1997,9 +1992,9 @@ let
       sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
 
-  xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
+  xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2007,9 +2002,9 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xpr = (mkDerivation "xpr" {
+  xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) {
     name = "xpr-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2017,9 +2012,9 @@ let
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xprop = (mkDerivation "xprop" {
+  xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
     name = "xprop-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2027,9 +2022,9 @@ let
       sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xproto = (mkDerivation "xproto" {
+  xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
     name = "xproto-7.0.26";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2037,9 +2032,9 @@ let
       sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xrandr = (mkDerivation "xrandr" {
+  xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
     name = "xrandr-1.4.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2047,9 +2042,9 @@ let
       sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
-  }) // {inherit libX11 xproto libXrandr libXrender ;};
+  })) // {inherit libX11 xproto libXrandr libXrender ;};
 
-  xrdb = (mkDerivation "xrdb" {
+  xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
     name = "xrdb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2057,9 +2052,9 @@ let
       sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xrefresh = (mkDerivation "xrefresh" {
+  xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) {
     name = "xrefresh-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2067,9 +2062,9 @@ let
       sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xset = (mkDerivation "xset" {
+  xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
     name = "xset-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2077,9 +2072,9 @@ let
       sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
-  }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
+  })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
 
-  xsetroot = (mkDerivation "xsetroot" {
+  xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
     name = "xsetroot-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2087,9 +2082,9 @@ let
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
-  }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
+  })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
-  xtrans = (mkDerivation "xtrans" {
+  xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
     name = "xtrans-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2097,9 +2092,9 @@ let
       sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xvinfo = (mkDerivation "xvinfo" {
+  xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) {
     name = "xvinfo-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2107,9 +2102,9 @@ let
       sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
-  }) // {inherit libX11 xproto libXv ;};
+  })) // {inherit libX11 xproto libXv ;};
 
-  xwd = (mkDerivation "xwd" {
+  xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
     name = "xwd-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2117,9 +2112,9 @@ let
       sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xwininfo = (mkDerivation "xwininfo" {
+  xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
     name = "xwininfo-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2127,9 +2122,9 @@ let
       sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
-  }) // {inherit libX11 libxcb xproto ;};
+  })) // {inherit libX11 libxcb xproto ;};
 
-  xwud = (mkDerivation "xwud" {
+  xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) {
     name = "xwud-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2137,6 +2132,6 @@ let
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9c6618d3b105..04ee5f109611 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -230,11 +230,6 @@ args: with args;
 
 let
 
-  mkDerivation = name: attrs:
-    let newAttrs = (overrides."\${name}" or (x: x)) attrs;
-        stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
-
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
@@ -266,7 +261,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
     $extraAttrs = "" unless defined $extraAttrs;
 
     print OUT <<EOF
-  $pkg = (mkDerivation "$pkg" {
+  $pkg = (stdenv.mkDerivation ((if overrides ? $pkg then overrides.$pkg else x: x) {
     name = "$pkgNames{$pkg}";
     builder = ./builder.sh;
     src = fetchurl {
@@ -274,7 +269,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
       sha256 = "$pkgHashes{$pkg}";
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
-  }) // {inherit $inputs;};
+  })) // {inherit $inputs;};
 
 EOF
 }
-- 
cgit 1.4.1