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

nvidia-x11: patch for kernel 3.14 support

Browse Source
This commit is contained in:
Mathijs Kwik 2014-04-02 13:35:44 +02:00
parent 50b1a8ea0b
commit 5a3fa7f88f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
patches = optional (kernel ? version && versionAtLeast kernel.version "3.14") ./kernel-3.14.patch;
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {

12
pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch Normal file
View File

@ -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