diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-03-01 05:38:25 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-03-01 09:42:38 +0100 |
| commit | fc088ae732f566d46248269dd7c9c69e31ec4cdf (patch) | |
| tree | 0d781bdd61f19ab224add7decfb811ca07de77be /pkgs/applications/virtualization | |
| parent | 1029ca5767e3d27fbfbeb19a845ffee3485c028f (diff) | |
| download | nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.tar nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.tar.gz nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.tar.bz2 nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.tar.lz nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.tar.xz nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.tar.zst nixlib-fc088ae732f566d46248269dd7c9c69e31ec4cdf.zip | |
virtualbox: Fix build with kernel 3.9.0.
This patch is cherry-picked from VirtualBox Subversion, revision 44867. It's rather small and only is in effect if kernel version is >= 3.9.0, so it won't break existing kernels, so I'm adding it here despite we usually only care about the latest stable upstream (kernel) versions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch | 22 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch new file mode 100644 index 000000000000..2c3cdebacde8 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch @@ -0,0 +1,22 @@ +commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb +Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> +Date: Thu Feb 28 13:46:12 2013 +0000 + + Linux 3.9.0 rc0 compile fix + + git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f + +diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +index ec9b502..7a208d1 100644 +--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ++++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +@@ -90,6 +90,9 @@ + #include <linux/slab.h> + #include <linux/time.h> + #include <linux/sched.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) ++# include <linux/sched/rt.h> ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7) + # include <linux/jiffies.h> + #endif diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 05a9dd7e7d86..62a4b16070d2 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -57,6 +57,7 @@ in stdenv.mkDerivation { patches = [ ./missing_files_4.2.8.patch ./strict_types.patch + ./build_fix_3.9.0.patch ]; prePatch = '' |