diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/os-specific/linux/nvidiabl | |
parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
Diffstat (limited to 'pkgs/os-specific/linux/nvidiabl')
-rw-r--r-- | pkgs/os-specific/linux/nvidiabl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidiabl/linux4compat.patch | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index a5a43926e0459..a6797608664f6 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj"; }; + patches = [ ./linux4compat.patch ]; + preConfigure = '' sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile ''; diff --git a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch new file mode 100644 index 0000000000000..ad8236a2b6306 --- /dev/null +++ b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch @@ -0,0 +1,22 @@ +From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001 +From: sonic414 <sonic414@gmail.com> +Date: Tue, 28 Apr 2015 19:30:15 +0530 +Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0 + +--- + nvidiabl-module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nvidiabl-module.c b/nvidiabl-module.c +index b789ea4..b306579 100644 +--- a/nvidiabl-module.c ++++ b/nvidiabl-module.c +@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) + + for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) { +- if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) { ++ if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) { + props.type = backlight_type_ids[iii].type; + printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id); + } |