mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Making nvidia build with linux 3.14. Patch not needed anymore.

Browse source
This commit is contained in:
Lluís Batlle i Rossell 2014-04-23 15:58:54 +02:00
parent eb07baf75c
commit 8ef1d4ecdb
2 changed files with 0 additions and 14 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,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 {

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

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