anchor.diff:      system == "x86_64-darwin" ||
       system == "i686-darwin";
   
  -  mesa = import ../development/libraries/mesa {
  -    inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm;
  +  mesa = callPackage ../development/libraries/mesa { 
       lipo = if stdenv.isDarwin then darwinLipoUtility else null;
     };
   
  -  ming = import ../development/libraries/ming {
  -    inherit fetchurl stdenv flex bison freetype zlib libpng perl;
  -  };
  -
  -  mlt = import ../development/libraries/mlt {
  -    inherit fetchurl stdenv pkgconfig SDL ffmpeg libdv libxml2 libsamplerate
  -      libvorbis sox;
  +  ming = callPackage ../development/libraries/ming { };
  +
  +  mlt = callPackage ../development/libraries/mlt { 
       qt = qt4;
     };
   
  -  mpeg2dec = import ../development/libraries/mpeg2dec {
  -    inherit fetchurl stdenv;
  -  };
  -
  -  msilbc = import ../development/libraries/msilbc {
  -    inherit fetchurl stdenv ilbc mediastreamer pkgconfig;
  -  };
  -
  -  mpc = import ../development/libraries/mpc {
  -    inherit fetchurl stdenv gmp mpfr;
  -  };
  -
  -  mpich2 = import ../development/libraries/mpich2 {
  -    inherit fetchurl stdenv python perl;
  -  };
  -
  -  muparser = import ../development/libraries/muparser {
  -    inherit fetchurl stdenv;
  -  };
  +  mpeg2dec = callPackage ../development/libraries/mpeg2dec { };
  +
  +  msilbc = callPackage ../development/libraries/msilbc { };
  +
  +  mpc = callPackage ../development/libraries/mpc { };
  +
  +  mpich2 = callPackage ../development/libraries/mpich2 { };
  +
  +  muparser = callPackage ../development/libraries/muparser { };
   
     ncurses = makeOverridable (import ../development/libraries/ncurses) {
       inherit fetchurl stdenv;
  
positive.code:       makeWrapper graphviz which python;
    };
  
    vim = makeOverridable (import ../applications/editors/vim) {
      inherit fetchurl stdenv ncurses;
    };
  
    vimHugeX = vim_configurable;
  
  
negative.code:     imagemagick=imagemagick;
    };
  
    cvs = callPackage ../applications/version-management/cvs { };
  
    cvsps = callPackage ../applications/version-management/cvsps { };
  
    cvs2svn = callPackage ../applications/version-management/cvs2svn { };
  
    d4x = callPackage ../applications/misc/d4x { 
      inherit (gtkLibs) gtk glib;
    };
  
    darcs = haskellPackages.darcs;
  
    dia = callPackage ../applications/graphics/dia { 
      inherit (gtkLibs) gtk glib;
    };
  
    djvulibre = callPackage ../applications/misc/djvulibre { };
  
    djview4 = callPackage ../applications/graphics/djview { };
  
    dmenu = callPackage ../applications/misc/dmenu { };
  
    dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
      inherit libpng libtiff libjpeg imagemagick librsvg
  