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

nvidia: Add 4.2 patch

Browse Source
This commit is contained in:
William A. Kennington III 2015-08-31 00:08:33 -07:00
parent 8e26a55dc4
commit 5056267761
2 changed files with 28 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

@ -37,6 +37,8 @@ stdenv.mkDerivation {
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
patches = [ ./nvidia-4.2.patch ];
inherit versionNumber libsOnly;
inherit (stdenv) system;

26
pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c
index 65bbb1b..be39c8d 100644
--- a/kernel/nv-frontend.c
+++ b/kernel/nv-frontend.c
@@ -15,7 +15,7 @@
#include "nv-frontend.h"
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL\0NVIDIA");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
diff --git a/kernel/nv.c b/kernel/nv.c
index abe81ed..05945b5 100644
--- a/kernel/nv.c
+++ b/kernel/nv.c
@@ -31,7 +31,7 @@
#if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0)
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL\0NVIDIA");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");