alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

virtualbox: minor update, lock versions with guest-additions

Browse source 
I saw no reason to use requireFile, it seems normally downloadable.
This commit is contained in:
Vladimír Čunát 2013-06-23 14:35:33 +02:00 committed by Bjørn Forsman
parent 45f7b9c319
commit 6c86398ff3
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/virtualization/virtualbox/default.nix
View file

@ -11,8 +11,7 @@ with stdenv.lib;
let let
version = "4.2.12"; version = "4.2.14"; # changes ./guest-additions as well
extpackRevision = "84980";
forEachModule = action: '' forEachModule = action: ''
for mod in \ for mod in \
@ -31,12 +30,10 @@ let
done done
''; '';
extensionPack = requireFile { extensionPack = fetchurl {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}" url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
+ ".vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp! # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4"; sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
url = "https://www.virtualbox.org/wiki/Downloads";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -44,7 +41,7 @@ in 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 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6"; sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
}; };
buildInputs = buildInputs =
@ -137,6 +134,8 @@ in stdenv.mkDerivation {
done done
''; '';
passthru = { inherit version; /* for guest additions */ };
meta = { meta = {
description = "PC emulator"; description = "PC emulator";
homepage = http://www.virtualbox.org/; homepage = http://www.virtualbox.org/;

6
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper { stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
, xorg, dbus }: , xorg, dbus, virtualbox }:
let let
version = "4.2.12"; version = virtualbox.version;
xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
xserverABI = xserverVListFunc 0 + xserverVListFunc 1; xserverABI = xserverVListFunc 0 + xserverVListFunc 1;
in in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
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 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8"; sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
}; };
KERN_DIR = "${kernelDev}/lib/modules/*/build"; KERN_DIR = "${kernelDev}/lib/modules/*/build";