diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-31 00:08:33 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-31 00:08:33 -0700 |
| commit | 5056267761c6f6163645a8eea5db483e560c4e0a (patch) | |
| tree | 2d280ab32fcd2a5c1721eac13104d916bf5a47d4 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | 8e26a55dc4e91b6590b6f616c0db1f22bef88b89 (diff) | |
| download | nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.tar nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.tar.gz nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.tar.bz2 nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.tar.lz nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.tar.xz nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.tar.zst nixpkgs-5056267761c6f6163645a8eea5db483e560c4e0a.zip | |
nvidia: Add 4.2 patch
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/nvidia-4.2.patch | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 1f581eb6de9..953c8c60125 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch new file mode 100644 index 00000000000..412b786179a --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch @@ -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"); |