VirtualBox 4.1.12
svn path=/nixpkgs/trunk/; revision=33888
This commit is contained in:
parent
50a0b839af
commit
f9a88de275
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let version = "4.1.10"; in
|
let version = "4.1.12"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "virtualbox-${version}-${kernel.version}";
|
name = "virtualbox-${version}-${kernel.version}";
|
||||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||||
sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
|
sha256 = "00hx7cl8n4qdmipxxx8a96x8yw6yim9bz3fjbyzcrs8yls0r2jsf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
|
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
|
||||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
|
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
|
||||||
|
|
||||||
let version = "4.1.0"; in
|
let version = "4.1.12"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "VirtualBox-GuestAdditions-${version}";
|
name = "VirtualBox-GuestAdditions-${version}";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||||
sha256 = "0azj08l0457cjl5v2ddgb5kz8gblsi7cgjgdmyiszvlqpyfbh98w";
|
sha256 = "0if2q188zf608p1dkq6pd46dafhslqcxmfpmarypbd68k7fi7kkx";
|
||||||
};
|
};
|
||||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||||
buildInputs = [ patchelf cdrkit makeWrapper ];
|
buildInputs = [ patchelf cdrkit makeWrapper ];
|
||||||
@ -98,16 +98,13 @@ stdenv.mkDerivation {
|
|||||||
# Install desktop file
|
# Install desktop file
|
||||||
mkdir -p $out/share/autostart
|
mkdir -p $out/share/autostart
|
||||||
cp -v share/VBoxGuestAdditions/vboxclient.desktop $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
|
# Install Xorg drivers
|
||||||
mkdir -p $out/lib/xorg/modules/{drivers,input}
|
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/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
|
# Install kernel modules
|
||||||
cd src
|
cd src
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user