diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-04-02 13:35:44 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-04-11 23:40:16 +0200 |
| commit | 5a3fa7f88f2fe10eddecb708b0b9c559eda841b4 (patch) | |
| tree | 72a7f065d33ed1c7c576c994ff22660b625a16a3 /pkgs/os-specific | |
| parent | 50b1a8ea0b621a7a09be17a2ade0805e43221e03 (diff) | |
| download | nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.tar nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.tar.gz nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.tar.bz2 nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.tar.lz nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.tar.xz nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.tar.zst nixlib-5a3fa7f88f2fe10eddecb708b0b9c559eda841b4.zip | |
nvidia-x11: patch for kernel 3.14 support
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch | 12 |
2 files changed, 14 insertions, 0 deletions
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 |