diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2014-04-23 15:58:54 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2014-04-23 16:06:15 +0200 |
| commit | 8ef1d4ecdbf1b895202ee6236c4a506247052b7a (patch) | |
| tree | b6f42ab0ac0306d65baea319081818c95fe2c7fe /pkgs/os-specific/linux/nvidia-x11 | |
| parent | eb07baf75ce37abe8b816646412de57f5856f4b2 (diff) | |
| download | nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.tar nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.tar.gz nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.tar.bz2 nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.tar.lz nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.tar.xz nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.tar.zst nixlib-8ef1d4ecdbf1b895202ee6236c4a506247052b7a.zip | |
Making nvidia build with linux 3.14. Patch not needed anymore.
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -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, 0 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2eb5c7e480a2..2afbf12097cd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -21,8 +21,6 @@ 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 deleted file mode 100644 index 07fb7652d32d..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 |