[Nix-dev] Patch for broadcom_sta and linux 3.4
Kevin Quick
quick at sparq.org
Wed Jul 18 06:37:16 CEST 2012
The following patch to the broadcom_sta packages is needed for linux 3.4,
which dropped the "asm/system.h" include file:
# git diff
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix
b/pkgs/os-specific/linux/broadcom-sta/default.nix
index ff21b5d..e5e1892 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
};
buildInputs = [ kernel ];
- patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch ];
+ patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch
./linux-3.4.patch ];
#++ stdenv.lib.optional
#(! builtins.lessThan (builtins.compareVersions kernel.version
"2.6.37") 0)
#[ ./mutex-sema.patch ];
# cat pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch
diff -Naur broadcom-sta.orig/src/wl/sys/wl_linux.c
broadcom-sta.new/src/wl/sys/wl_linux.c
--- broadcom-sta.orig/src/wl/sys/wl_linux.c 2012-07-15 13:28:47.000000000
-0700
+++ broadcom-sta.new/src/wl/sys/wl_linux.c 2012-07-15 13:57:40.000000000
-0700
@@ -40,7 +40,6 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
-#include <asm/system.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
#
--
-KQ
More information about the nix-dev
mailing list