Author: shlevy
Date: Mon Apr 23 04:25:18 2012
New Revision: 33888
URL: https://nixos.org/websvn/nix/?rev=33888&sc=1
Log:
VirtualBox 4.1.12
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Modified: nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
Mon Apr 23 00:41:37 2012 (r33887)
+++ nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
@@ -8,7 +8,7 @@
with stdenv.lib;
-let version = "4.1.10"; in
+let version = "4.1.12"; in
stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
@@ -17,7 +17,7 @@
src = fetchurl {
url =
"http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";;
- sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
+ sha256 = "00hx7cl8n4qdmipxxx8a96x8yw6yim9bz3fjbyzcrs8yls0r2jsf";
};
buildInputs =
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Mon Apr 23 00:41:37 2012 (r33887)
+++
nixpkgs/trunk/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Mon Apr 23 04:25:18 2012 (r33888)
@@ -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 @@
# 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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
