diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-09-14 02:20:16 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-09-14 02:20:16 +0200 |
commit | 1781e955779397e4c39d406909823841210df962 (patch) | |
tree | 6c406d107638f1a51d83a230f8b7c7c9490853da /pkgs/os-specific | |
parent | 3efebb16807f9335d0a15d55a806a2eaccff0190 (diff) | |
parent | f7563efa6e01c3dbc883a1c0047d4beeddc4fc86 (diff) | |
download | nixlib-1781e955779397e4c39d406909823841210df962.tar nixlib-1781e955779397e4c39d406909823841210df962.tar.gz nixlib-1781e955779397e4c39d406909823841210df962.tar.bz2 nixlib-1781e955779397e4c39d406909823841210df962.tar.lz nixlib-1781e955779397e4c39d406909823841210df962.tar.xz nixlib-1781e955779397e4c39d406909823841210df962.tar.zst nixlib-1781e955779397e4c39d406909823841210df962.zip |
Merge pull request #18567 (VirtualBox 5.1.6)
This introduces VirtualBox version 5.1.6 along with a few refactored stuff, notably: * Kernel modules and user space applications are now separate derivations. * If config.pulseaudio doesn't exist in nixpkgs config, the default is now to build with PulseAudio modules. * A new updater to keep VirtualBox up to date. All subtests in nixos/tests/virtualbox.nix succeed on my machine and VirtualBox was reported to be working by @DamienCassou (although with unrelated audio problems for another fix/branch) and @calbrecht.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/virtualbox/default.nix | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix new file mode 100644 index 000000000000..593c4400b7f4 --- /dev/null +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -0,0 +1,23 @@ +{ stdenv, virtualbox, kernel, strace }: + +stdenv.mkDerivation { + name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; + src = virtualbox.modsrc; + hardeningDisable = [ + "fortify" "pic" "stackprotector" + ]; + + makeFlags = [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; + + enableParallelBuilding = true; + + meta = virtualbox.meta // { + description = virtualbox.meta.description + " (kernel modules)"; + }; +} |