Removed all earlier virtualbox attempts, since they are obsolete now

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

pkgs/applications/virtualization/virtualbox/1.5.2.nix

@@ -1,23 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://www.virtualbox.org/download/1.5.2/VirtualBox-1.5.2_OSE.tar.bz2;
-			sha256 = "1g9rvkqjcsfx36gwk6i9c0bml6053xx2mdn1sn7vyyy0sgwkwk53";
-		};
-		buildInputs = [libXcursor bridge_utils umlutilities kernelHeaders 
-		      wine jre libxslt libIDL SDL qt3 openssl zlib];
-		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "VirtualBox-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-		Virtual Box is just software for running virtual machines. 
-";
-		inherit src;
-	};
-}

pkgs/applications/virtualization/virtualbox/2.1.2.nix

@@ -1,47 +0,0 @@
-{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel}:
-
-stdenv.mkDerivation {
-  name = "virtualbox-2.1.2";
-
-  src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/2.1.2/VirtualBox-2.1.2-OSE.tar.bz2;
-    sha256 = "d3c1ae8ed7594094aaf8496204c5415479e1943e5b5179c5baae8a66885362de";
-  };
-
-  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel];
-
-  patchPhase = "
-    set -x
-    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
-    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
-        -i configure
-    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
-    export USER=nix
-    set +x
-  ";
-
-  configurePhase = ''
-    # It wants the qt utils from qt3, and it takes them from QTDIR
-    export QTDIR=${qt3}
-    ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
-    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-        -i AutoConfig.kmk
-    sed -e 's@arch/x86/@@' \
-        -i Config.kmk
-    cat >> AutoConfig.kmk << END_PATHS
-    VBOX_PATH_APP_PRIVATE := $out
-    VBOX_PATH_APP_DOCS := $out/doc
-    END_PATHS
-  '';
-
-  buildPhase = "
-    source env.sh
-    kmk
-  ";
-    
-  
-  meta = {
-    description = "PC emulator";
-    homepage = http://www.virtualbox.org/;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -7261,7 +7261,7 @@ let
       inherit (gnome) gtk glib pango libglade;
     };
 
-    virtualbox = import ../applications/virtualization/virtualbox/2.2.0.nix {
+    virtualbox = import ../applications/virtualization/virtualbox {
       stdenv = stdenv_32bit;
       inherit fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
           libcap libpng zlib kernel python which;
@@ -9074,15 +9074,6 @@ let
     flags = [ "X11" ]; # only flag "X11" by now
   };
 
-  /*virtualboxFun = lib.sumArgs (selectVersion ../applications/virtualization/virtualbox "1.5.2") {
-    inherit stdenv fetchurl builderDefs bridge_utils umlutilities kernelHeaders
-      wine jre libxslt SDL qt3 openssl zlib;
-    inherit (xorg) libXcursor;
-    inherit (gnome) libIDL;
-  };
-
-  virtualbox = virtualboxFun null;*/
-
   vlc = import ../applications/video/vlc {
     inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2
       ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf;