From 5a3fa7f88f2fe10eddecb708b0b9c559eda841b4 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 2 Apr 2014 13:35:44 +0200
Subject: nvidia-x11: patch for kernel 3.14 support

---
 pkgs/os-specific/linux/nvidia-x11/default.nix       |  2 ++
 pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 7391a6fdf4c3..74863496a0f7 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
 
+  patches = optional (kernel ? version && versionAtLeast kernel.version "3.14") ./kernel-3.14.patch;
+
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch b/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch
new file mode 100644
index 000000000000..07fb7652d32d
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch
@@ -0,0 +1,12 @@
+--- a/kernel/nv-linux.h         2014-01-09 04:49:25.000000000 +0200
++++ b/kernel/nv-linux.h         2014-02-05 16:46:55.552408568 +0200
+@@ -273,8 +273,7 @@
+ #endif
+ 
+ #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
-- 
cgit 1.4.1