about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/virtualbox/guest-additions
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2012-04-23 04:25:18 +0000
committerShea Levy <shea@shealevy.com>2012-04-23 04:25:18 +0000
commitf9a88de275ae75a55f0b43293d7c11237638dc60 (patch)
tree8dd49413618720ad3168bb000b4efb7ef87a0788 /pkgs/applications/virtualization/virtualbox/guest-additions
parent50a0b839af5ca49075d268b93e4a94473ff4cfff (diff)
downloadnixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.tar
nixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.tar.gz
nixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.tar.bz2
nixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.tar.lz
nixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.tar.xz
nixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.tar.zst
nixlib-f9a88de275ae75a55f0b43293d7c11237638dc60.zip
VirtualBox 4.1.12
svn path=/nixpkgs/trunk/; revision=33888
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox/guest-additions')
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f9adf6132f5d..a11e4ee8218e 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
-let version = "4.1.0"; in
+let version = "4.1.12"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}";
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "0azj08l0457cjl5v2ddgb5kz8gblsi7cgjgdmyiszvlqpyfbh98w";
+    sha256 = "0if2q188zf608p1dkq6pd46dafhslqcxmfpmarypbd68k7fi7kkx";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit makeWrapper ];
@@ -98,16 +98,13 @@ stdenv.mkDerivation {
     # Install desktop file
     mkdir -p $out/share/autostart
     cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart
-    
-    # Install HAL FDI file
-    mkdir -p $out/share/hal/fdi/policy
-    install -m 644 share/VBoxGuestAdditions/90-vboxguest.fdi $out/share/hal/fdi/policy
-    
+
     # Install Xorg drivers
     mkdir -p $out/lib/xorg/modules/{drivers,input}
     install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
-    install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
-    
+    # There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever?
+#    install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
+
     # Install kernel modules
     cd src