diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/os-specific/linux/nvidiabl | |
parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
download | nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.zip |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
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, 0 insertions, 24 deletions
diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index a6797608664..a5a43926e04 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -8,8 +8,6 @@ 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 deleted file mode 100644 index ad8236a2b63..00000000000 --- a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -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); - } |