lol

* composedArgsAndFun -> makeOverridable for consistency. * Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803

+36 -278
pkgs/applications/graphics/gocr/0.44.nix pkgs/applications/graphics/gocr/default.nix
pkgs/applications/networking/p2p/ldcpp/1.0.3.nix pkgs/applications/networking/p2p/ldcpp/default.nix
pkgs/applications/virtualization/qemu/linux-img/0.2.nix pkgs/applications/virtualization/qemu/linux-img/default.nix
pkgs/applications/window-managers/fbpanel/4.12.nix pkgs/applications/window-managers/fbpanel/default.nix
pkgs/data/fonts/clearlyU/1.9.nix pkgs/data/fonts/clearlyU/default.nix
pkgs/data/fonts/junicode/0.6.15.nix pkgs/data/fonts/junicode/default.nix
pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix pkgs/data/fonts/wqy_zenhei/default.nix
pkgs/development/compilers/qi/9.1.nix pkgs/development/compilers/qi/default.nix
pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix pkgs/development/libraries/libdbi-drivers/default.nix
pkgs/development/libraries/libdbi/0.8.2.nix pkgs/development/libraries/libdbi/default.nix
pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix pkgs/development/libraries/mediastreamer/default.nix
pkgs/development/tools/misc/ltrace/0.5-3deb.nix pkgs/development/tools/misc/ltrace/default.nix
pkgs/games/construo/0.2.2.nix pkgs/games/construo/default.nix
pkgs/games/orbit/1.01.nix pkgs/games/orbit/default.nix
-38
pkgs/os-specific/linux/atheros/0.9.3.3.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs { 3 - src = /* put a fetchurl here */ 4 - fetchurl { 5 - url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.3.tar.bz2; 6 - sha256 = "1dq56dx81wfhpgipbrl3gk2is3g1xvysx2pl6vxyj0dhslkcnf3y"; 7 - }; 8 - 9 - buildInputs = []; 10 - configureFlags = []; 11 - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; 12 - patchAR2425x86 = ""; /*(if args ? pci001c_rev01 && args.pci001c_rev01 then 13 - fetchurl { 14 - url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw; 15 - name = "madwifi-AR2425-x86.patch"; 16 - sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg"; 17 - } else "")*/; 18 - } null; /* null is a terminator for sumArgs */ 19 - in with localDefs; 20 - let 21 - doPatch = fullDepEntry (if patchAR2425x86 !="" then '' 22 - cd hal 23 - patch -Np1 -i ${patchAR2425x86} 24 - '' else "") [minInit doUnpack]; 25 - postInstall = fullDepEntry ('' 26 - ln -s $out/usr/local/bin $out/bin 27 - '') [minInit doMakeInstall]; 28 - in 29 - stdenv.mkDerivation rec { 30 - name = "atheros-"+version; 31 - builder = writeScript (name + "-builder") 32 - (textClosure localDefs [doPatch doMakeInstall 33 - postInstall doForceShare doPropagate]); 34 - meta = { 35 - description = "Atheros WiFi driver"; 36 - inherit src; 37 - }; 38 - }
-39
pkgs/os-specific/linux/atheros/r2756.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs { 3 - src = /* put a fetchurl here */ 4 - fetchurl { 5 - url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz; 6 - sha256 = "0mm1kx9pjvvla792rv7k48yhsa0fpzvd1717g9xzazjsz2mqwzyv"; 7 - }; 8 - 9 - buildInputs = []; 10 - configureFlags = []; 11 - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; 12 - patchAR2425x86 = (if args ? pci001c_rev01 && args.pci001c_rev01 then 13 - fetchurl { 14 - url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw; 15 - name = "madwifi-AR2425-x86.patch"; 16 - sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg"; 17 - } else ""); 18 - } null; /* null is a terminator for sumArgs */ 19 - in with localDefs; 20 - let 21 - doPatch = fullDepEntry (if patchAR2425x86 !="" then '' 22 - cd hal 23 - patch -Np1 -i ${patchAR2425x86} 24 - cd .. 25 - '' else "") [minInit doUnpack]; 26 - postInstall = fullDepEntry ('' 27 - ln -s $out/usr/local/bin $out/bin 28 - '') [minInit doMakeInstall]; 29 - in 30 - stdenv.mkDerivation rec { 31 - name = "atheros-"+version; 32 - builder = writeScript (name + "-builder") 33 - (textClosure localDefs [doPatch doMakeInstall 34 - postInstall doForceShare doPropagate]); 35 - meta = { 36 - description = "Atheros WiFi driver."; 37 - inherit src; 38 - }; 39 - }
-28
pkgs/os-specific/linux/atheros/r3122.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs { 3 - src = /* put a fetchurl here */ 4 - fetchurl { 5 - url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz; 6 - sha256 = "188258c6q96n8lb57c0cqsvxp47psninirdax13w4yd07v1rymwd"; 7 - }; 8 - 9 - buildInputs = []; 10 - configureFlags = []; 11 - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; 12 - } null; /* null is a terminator for sumArgs */ 13 - in with localDefs; 14 - let 15 - postInstall = fullDepEntry ('' 16 - ln -s $out/usr/local/bin $out/bin 17 - '') [minInit doMakeInstall]; 18 - in 19 - stdenv.mkDerivation rec { 20 - name = "atheros-"+version; 21 - builder = writeScript (name + "-builder") 22 - (textClosure localDefs [doMakeInstall postInstall 23 - doForceShare doPropagate]); 24 - meta = { 25 - description = "Atheros WiFi driver"; 26 - inherit src; 27 - }; 28 - }
-28
pkgs/os-specific/linux/atheros/r3574.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs { 3 - src = /* put a fetchurl here */ 4 - fetchurl { 5 - url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3574-20080426.tar.gz; 6 - sha256 = "1awr8jxrh6nvrsnyaydafkz7yarax3h4xphjcx6gmwsfbyb2mj7q"; 7 - }; 8 - 9 - buildInputs = []; 10 - configureFlags = []; 11 - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; 12 - } null; /* null is a terminator for sumArgs */ 13 - in with localDefs; 14 - let 15 - postInstall = fullDepEntry ('' 16 - ln -s $out/usr/local/bin $out/bin 17 - '') [minInit doMakeInstall]; 18 - in 19 - stdenv.mkDerivation rec { 20 - name = "atheros-"+version; 21 - builder = writeScript (name + "-builder") 22 - (textClosure localDefs [doMakeInstall postInstall 23 - doForceShare doPropagate]); 24 - meta = { 25 - description = "Atheros WiFi driver"; 26 - inherit src; 27 - }; 28 - }
-41
pkgs/os-specific/linux/atheros/r3693.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs.passthru.function { 3 - src = fetchurl { 4 - url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz; 5 - sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3"; 6 - }; 7 - 8 - buildInputs = []; 9 - configureFlags = []; 10 - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; 11 - hal20080528 = fetchurl { 12 - url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz; 13 - sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9"; 14 - }; 15 - }; 16 - in with localDefs; 17 - let 18 - preBuild = fullDepEntry ('' 19 - echo Replacing HAL. 20 - tar xvf ${hal20080528} 21 - rm -r hal 22 - mv ath_hal-* hal 23 - '') ["minInit" "doUnpack"]; 24 - postInstall = fullDepEntry ('' 25 - ln -s $out/usr/local/bin $out/bin 26 - '') [minInit doMakeInstall]; 27 - in 28 - stdenv.mkDerivation rec { 29 - name = "atheros-"+version; 30 - builder = writeScript (name + "-builder") 31 - (textClosure localDefs 32 - ((lib.optional 33 - (lib.attrByPath ["freshHAL"] false args) 34 - preBuild) 35 - ++ [doMakeInstall postInstall 36 - doForceShare doPropagate])); 37 - meta = { 38 - description = "Atheros WiFi driver"; 39 - inherit src; 40 - }; 41 - }
-45
pkgs/os-specific/linux/atheros/r3837.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs.passthru.function { 3 - src = fetchurl { 4 - url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz; 5 - sha256 = "0yj6jxlygb5bdnysmn47dn4wi220ma310vd885a1pl7hp3ky216m"; 6 - }; 7 - 8 - buildInputs = []; 9 - configureFlags = []; 10 - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; 11 - hal20080528 = fetchurl { 12 - url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz; 13 - sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9"; 14 - }; 15 - injectionPatchFile = ./inj.patch; 16 - }; 17 - in with localDefs; 18 - let 19 - preBuild = fullDepEntry ('' 20 - echo Replacing HAL. 21 - tar xvf ${hal20080528} 22 - rm -r hal 23 - mv ath_hal-* hal 24 - '') ["minInit" "doUnpack"]; 25 - postInstall = fullDepEntry ('' 26 - ln -s $out/usr/local/bin $out/bin 27 - '') [minInit doMakeInstall]; 28 - in 29 - stdenv.mkDerivation rec { 30 - name = "atheros-"+version; 31 - patches = lib.optional 32 - (lib.attrByPath ["injectionPatch"] false args) 33 - injectionPatchFile; 34 - builder = writeScript (name + "-builder") 35 - (textClosure localDefs 36 - ((lib.optional 37 - (lib.attrByPath ["freshHAL"] false args) 38 - preBuild) 39 - ++ [doPatch doMakeInstall postInstall 40 - doForceShare doPropagate])); 41 - meta = { 42 - description = "Atheros WiFi driver"; 43 - inherit src; 44 - }; 45 - }
+2 -2
pkgs/servers/x11/xorg/replacements.nix
··· 1 - {stdenv, fetchurl, xorg, automake, autoconf, libtool, composedArgsAndFun}: 1 + {stdenv, fetchurl, xorg, automake, autoconf, libtool, makeOverridable}: 2 2 { 3 3 xf86videoati = {src, suffix}: 4 - composedArgsAndFun stdenv.mkDerivation { 4 + makeOverridable stdenv.mkDerivation { 5 5 name = "xf86-video-ati-${suffix}"; 6 6 buildInputs = xorg.xf86videoati.buildInputs ++ 7 7 [autoconf automake libtool];
pkgs/tools/X11/x11vnc/0.9.3.nix pkgs/tools/X11/x11vnc/default.nix
pkgs/tools/X11/x2vnc/1.7.2.nix pkgs/tools/X11/x2vnc/default.nix
pkgs/tools/misc/rlwrap/0.28.nix pkgs/tools/misc/rlwrap/default.nix
pkgs/tools/networking/nc6/1.0.nix pkgs/tools/networking/nc6/default.nix
pkgs/tools/security/ssss/0.5.nix pkgs/tools/security/ssss/default.nix
-21
pkgs/tools/system/gdmap/0.7.5.nix
··· 1 - args : with args; 2 - let localDefs = builderDefs { 3 - src = /* put a fetchurl here */ 4 - fetchurl { 5 - url = http://dfn.dl.sourceforge.net/sourceforge/gdmap/gdmap-0.7.5.tar.gz; 6 - sha256 = "0vxfgz1bq0jvny6dy7dkzg2kl56plrxby6c4y5d6bv4bq2xd6v26"; 7 - }; 8 - 9 - buildInputs = [gtk pkgconfig libxml2 intltool]; 10 - configureFlags = []; 11 - } null; /* null is a terminator for sumArgs */ 12 - in with localDefs; 13 - stdenv.mkDerivation rec { 14 - name = "gdmap"+version; 15 - builder = writeScript (name + "-builder") 16 - (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); 17 - meta = { 18 - description = "Recursive rectangle map of disk usage"; 19 - inherit src; 20 - }; 21 - }
pkgs/tools/system/gdmap/0.8.1.nix pkgs/tools/system/gdmap/default.nix
+34 -36
pkgs/top-level/all-packages.nix
··· 158 158 abort ("Unknown option specified: " + result)) 159 159 else x); 160 160 161 - builderDefs = composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) { 161 + builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) { 162 162 inherit stringsWithDeps lib stdenv writeScript 163 163 fetchurl fetchmtn fetchgit; 164 164 }; 165 - 166 - composedArgsAndFun = lib.composedArgsAndFun; 167 165 168 166 builderDefsPackage = builderDefs.builderDefsPackage builderDefs; 169 167 ··· 661 659 libiconv = if stdenv.isDarwin then libiconv else null; 662 660 }; 663 661 664 - dosfstools = composedArgsAndFun (import ../tools/filesystems/dosfstools) { 662 + dosfstools = makeOverridable (import ../tools/filesystems/dosfstools) { 665 663 inherit builderDefs; 666 664 }; 667 665 ··· 701 699 inherit fetchurl stdenv gettext; 702 700 }; 703 701 704 - eprover = composedArgsAndFun (import ../tools/misc/eProver) { 702 + eprover = makeOverridable (import ../tools/misc/eProver) { 705 703 inherit fetchurl stdenv which; 706 704 texLive = texLiveAggregationFun { 707 705 paths = [ ··· 786 784 inherit fetchurl stdenv; 787 785 }); 788 786 789 - gdmap = composedArgsAndFun (import ../tools/system/gdmap/0.8.1.nix) { 787 + gdmap = makeOverridable (import ../tools/system/gdmap) { 790 788 inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool 791 789 gettext; 792 790 inherit (gtkLibs) gtk; ··· 1229 1227 }; 1230 1228 }; 1231 1229 1232 - nc6 = composedArgsAndFun (import ../tools/networking/nc6/1.0.nix) { 1230 + nc6 = makeOverridable (import ../tools/networking/nc6) { 1233 1231 inherit builderDefs; 1234 1232 }; 1235 1233 ··· 1556 1554 inherit fetchurl stdenv libuuid; 1557 1555 }; 1558 1556 1559 - relfs = composedArgsAndFun (import ../tools/filesystems/relfs) { 1557 + relfs = makeOverridable (import ../tools/filesystems/relfs) { 1560 1558 inherit fetchcvs stdenv ocaml postgresql fuse pcre 1561 1559 builderDefs pkgconfig libuuid; 1562 1560 inherit (gnome) gnomevfs GConf; ··· 1585 1583 logger = inetutils; 1586 1584 }; 1587 1585 1588 - rlwrap = composedArgsAndFun (import ../tools/misc/rlwrap/0.28.nix) { 1586 + rlwrap = makeOverridable (import ../tools/misc/rlwrap) { 1589 1587 inherit builderDefs readline; 1590 1588 }; 1591 1589 ··· 1668 1666 inherit fetchurl stdenv; 1669 1667 }; 1670 1668 1671 - smbfsFuse = composedArgsAndFun (import ../tools/filesystems/smbfs-fuse) { 1669 + smbfsFuse = makeOverridable (import ../tools/filesystems/smbfs-fuse) { 1672 1670 inherit builderDefs samba fuse; 1673 1671 }; 1674 1672 ··· 1704 1702 tlsSupport = true; 1705 1703 }; 1706 1704 1707 - ssss = composedArgsAndFun (import ../tools/security/ssss/0.5.nix) { 1705 + ssss = makeOverridable (import ../tools/security/ssss) { 1708 1706 inherit builderDefs gmp; 1709 1707 }; 1710 1708 ··· 2929 2927 inherit fetchurl stdenv builderDefs python; 2930 2928 }; 2931 2929 2932 - Qi = composedArgsAndFun (import ../development/compilers/qi/9.1.nix) { 2930 + qi = makeOverridable (import ../development/compilers/qi) { 2933 2931 inherit clisp stdenv fetchurl builderDefs unzip; 2934 2932 }; 2935 2933 ··· 3351 3349 inherit fetchurl stdenv; 3352 3350 }; 3353 3351 3354 - ltrace = composedArgsAndFun (import ../development/tools/misc/ltrace/0.5-3deb.nix) { 3352 + ltrace = makeOverridable (import ../development/tools/misc/ltrace) { 3355 3353 inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils; 3356 3354 }; 3357 3355 ··· 4536 4534 inherit fetchurl stdenv; 4537 4535 }; 4538 4536 4539 - libdbi = composedArgsAndFun (import ../development/libraries/libdbi/0.8.2.nix) { 4537 + libdbi = makeOverridable (import ../development/libraries/libdbi) { 4540 4538 inherit stdenv fetchurl builderDefs; 4541 4539 }; 4542 4540 4543 - libdbiDriversBase = composedArgsAndFun (import ../development/libraries/libdbi-drivers/0.8.2-1.nix) { 4541 + libdbiDriversBase = makeOverridable (import ../development/libraries/libdbi-drivers) { 4544 4542 inherit stdenv fetchurl builderDefs libdbi; 4545 4543 }; 4546 4544 4547 - libdbiDrivers = libdbiDriversBase.passthru.function { 4545 + libdbiDrivers = libdbiDriversBase.override { 4548 4546 inherit sqlite mysql; 4549 4547 }; 4550 4548 ··· 5016 5014 }; 5017 5015 5018 5016 # failed to build 5019 - mediastreamer = composedArgsAndFun (import ../development/libraries/mediastreamer/2.2.0-cvs20080207.nix) { 5017 + mediastreamer = makeOverridable (import ../development/libraries/mediastreamer) { 5020 5018 inherit fetchurl stdenv automake libtool autoconf alsaLib pkgconfig speex 5021 5019 ortp ffmpeg; 5022 5020 }; ··· 5062 5060 inherit fetchurl stdenv; 5063 5061 }; 5064 5062 5065 - ncurses = makeOverridable (composedArgsAndFun (import ../development/libraries/ncurses)) { 5063 + ncurses = makeOverridable (import ../development/libraries/ncurses) { 5066 5064 inherit fetchurl stdenv; 5067 5065 # The "! (stdenv ? cross)" is for the cross-built arm ncurses, which 5068 5066 # don't build for me in unicode. ··· 6025 6023 inherit fetchurl stdenv openssh; 6026 6024 }; 6027 6025 6028 - openfire = composedArgsAndFun (import ../servers/xmpp/openfire) { 6026 + openfire = makeOverridable (import ../servers/xmpp/openfire) { 6029 6027 inherit builderDefs jre; 6030 6028 }; 6031 6029 ··· 6114 6112 python = pythonBase; 6115 6113 }); 6116 6114 6117 - xorgReplacements = composedArgsAndFun (import ../servers/x11/xorg/replacements.nix) { 6118 - inherit fetchurl stdenv automake autoconf libtool xorg composedArgsAndFun; 6115 + xorgReplacements = makeOverridable (import ../servers/x11/xorg/replacements.nix) { 6116 + inherit fetchurl stdenv automake autoconf libtool xorg makeOverridable; 6119 6117 }; 6120 6118 6121 6119 xorgVideoUnichrome = import ../servers/x11/xorg/unichrome/default.nix { ··· 6592 6590 then iwlwifi4965ucodeV2 6593 6591 else iwlwifi4965ucodeV1); 6594 6592 6595 - atheros = composedArgsAndFun (import ../os-specific/linux/atheros/0.9.4.nix) { 6593 + atheros = makeOverridable (import ../os-specific/linux/atheros/0.9.4.nix) { 6596 6594 inherit fetchurl stdenv builderDefs kernel lib; 6597 6595 }; 6598 6596 ··· 6865 6863 inherit stdenv fetchurl makeWrapper useSetUID dbus libxml2 pam hal pkgconfig pmount python pythonDBus; 6866 6864 }; 6867 6865 6868 - pcmciaUtils = composedArgsAndFun (import ../os-specific/linux/pcmciautils) { 6866 + pcmciaUtils = makeOverridable (import ../os-specific/linux/pcmciautils) { 6869 6867 inherit stdenv fetchurl udev yacc flex; 6870 6868 inherit sysfsutils module_init_tools; 6871 6869 ··· 7145 7143 inherit (xorg) mkfontdir mkfontscale; 7146 7144 }); 7147 7145 7148 - clearlyU = composedArgsAndFun (import ../data/fonts/clearlyU/1.9.nix) { 7146 + clearlyU = makeOverridable (import ../data/fonts/clearlyU) { 7149 7147 inherit builderDefs; 7150 7148 inherit (xorg) mkfontdir mkfontscale; 7151 7149 }; ··· 7191 7189 inherit fetchurl stdenv; 7192 7190 }; 7193 7191 7194 - junicode = composedArgsAndFun (import ../data/fonts/junicode/0.6.15.nix) { 7192 + junicode = makeOverridable (import ../data/fonts/junicode) { 7195 7193 inherit builderDefs fontforge unzip; 7196 7194 inherit (xorg) mkfontdir mkfontscale; 7197 7195 }; ··· 7289 7287 inherit fetchurl stdenv cabextract; 7290 7288 }; 7291 7289 7292 - wqy_zenhei = composedArgsAndFun (import ../data/fonts/wqy_zenhei/0.4.23-1.nix) { 7290 + wqy_zenhei = makeOverridable (import ../data/fonts/wqy_zenhei) { 7293 7291 inherit builderDefs; 7294 7292 }; 7295 7293 ··· 7866 7864 fltk = fltk20; 7867 7865 }; 7868 7866 7869 - fbpanel = composedArgsAndFun (import ../applications/window-managers/fbpanel/4.12.nix) { 7867 + fbpanel = makeOverridable (import ../applications/window-managers/fbpanel) { 7870 7868 inherit fetchurl stdenv builderDefs pkgconfig libpng libjpeg libtiff librsvg; 7871 7869 inherit (gtkLibs) gtk; 7872 7870 inherit (xlibs) libX11 libXmu libXpm; ··· 8066 8064 gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; 8067 8065 }; 8068 8066 8069 - gocr = composedArgsAndFun (import ../applications/graphics/gocr/0.44.nix) { 8067 + gocr = makeOverridable (import ../applications/graphics/gocr) { 8070 8068 inherit builderDefs fetchurl stdenv; 8071 8069 }; 8072 8070 ··· 8326 8324 fftw = fftwSinglePrec; 8327 8325 }; 8328 8326 8329 - ldcpp = composedArgsAndFun (import ../applications/networking/p2p/ldcpp/1.0.3.nix) { 8327 + ldcpp = makeOverridable (import ../applications/networking/p2p/ldcpp) { 8330 8328 inherit builderDefs scons pkgconfig bzip2 openssl; 8331 8329 inherit (gtkLibs) gtk; 8332 8330 inherit (gnome) libglade; ··· 8589 8587 inherit (gst_all) gstPluginsBase; 8590 8588 }; 8591 8589 8592 - pidginlatex = composedArgsAndFun (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) { 8590 + pidginlatex = makeOverridable (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) { 8593 8591 inherit fetchurl stdenv pkgconfig ghostscript pidgin texLive; 8594 8592 imagemagick = imagemagickBig; 8595 8593 inherit (gtkLibs) glib gtk; ··· 8646 8644 inherit fetchsvn SDL zlib which stdenv; 8647 8645 }; 8648 8646 8649 - qemuImage = composedArgsAndFun (import ../applications/virtualization/qemu/linux-img/0.2.nix) { 8647 + qemuImage = makeOverridable (import ../applications/virtualization/qemu/linux-img) { 8650 8648 inherit builderDefs fetchurl stdenv; 8651 8649 }; 8652 8650 ··· 9024 9022 ); 9025 9023 }; 9026 9024 9027 - x11vnc = composedArgsAndFun (import ../tools/X11/x11vnc/0.9.3.nix) { 9025 + x11vnc = makeOverridable (import ../tools/X11/x11vnc) { 9028 9026 inherit builderDefs openssl zlib libjpeg ; 9029 9027 inherit (xlibs) libXfixes fixesproto libXdamage damageproto 9030 9028 libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto ··· 9032 9030 libXrender; 9033 9031 }; 9034 9032 9035 - x2vnc = composedArgsAndFun (import ../tools/X11/x2vnc/1.7.2.nix) { 9033 + x2vnc = makeOverridable (import ../tools/X11/x2vnc) { 9036 9034 inherit builderDefs; 9037 9035 inherit (xlibs) libX11 xproto xextproto libXext libXrandr randrproto; 9038 9036 }; ··· 9247 9245 inherit fetchurl stdenv python pygame twisted lib numeric makeWrapper; 9248 9246 }; 9249 9247 9250 - construoBase = composedArgsAndFun (import ../games/construo/0.2.2.nix) { 9248 + construoBase = makeOverridable (import ../games/construo) { 9251 9249 inherit stdenv fetchurl builderDefs 9252 9250 zlib; 9253 9251 inherit (xlibs) libX11 xproto; 9254 9252 }; 9255 9253 9256 - construo = construoBase.passthru.function { 9254 + construo = construoBase.override { 9257 9255 inherit mesa freeglut; 9258 9256 }; 9259 9257 ··· 9381 9379 }; 9382 9380 9383 9381 # You still can override by passing more arguments. 9384 - spaceOrbit = composedArgsAndFun (import ../games/orbit/1.01.nix) { 9382 + spaceOrbit = makeOverridable (import ../games/orbit) { 9385 9383 inherit fetchurl stdenv builderDefs mesa freeglut; 9386 9384 inherit (gnome) esound; 9387 9385 inherit (xlibs) libXt libX11 libXmu libXi libXext;