public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs

Browse Source 
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
This commit is contained in:
Shea Levy
2014-03-29 00:23:54 -04:00
parent 63f97fe9db 53e743fa08
commit 1aa5589eef
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/virtualbox-guest.nix
+3 -1
View File
@@ -38,6 +38,8 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
boot.kernelModules = [ "vboxsf" ];
users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf;
systemd.services.virtualbox =
@@ -52,7 +54,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
};
hardware.opengl.videoDrivers = mkOverride 50 [ "virtualbox" ];
services.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
services.xserver.config =
''