about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/spl/default.nix
diff options
context:
space:
mode:
authorJack Cummings <jack@mudshark.org>2012-10-22 11:42:15 -0700
committerDavid Guibert <david.guibert@gmail.com>2012-11-15 07:41:11 +0100
commit0611a8b223d76b917059c7267bb7c1d8a5d8e172 (patch)
tree2e0edb9e88e17994f6b79693292ba53133dfb7cf /pkgs/os-specific/linux/spl/default.nix
parentb9996984406f20020d7e780844b3f514e164e332 (diff)
downloadnixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.tar
nixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.tar.gz
nixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.tar.bz2
nixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.tar.lz
nixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.tar.xz
nixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.tar.zst
nixlib-0611a8b223d76b917059c7267bb7c1d8a5d8e172.zip
Linux-3.6 fixes. Need to ./autogen.sh in zfs now, as the linux-3.6 patch adds autoconf macros. Which means that all of my Makefile.in patches need to be puplifted to Makefile.am patches.
Diffstat (limited to 'pkgs/os-specific/linux/spl/default.nix')
-rw-r--r--pkgs/os-specific/linux/spl/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index cc07709559c2..1b1aee600fb0 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g";
   };
 
-  patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];
+  patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ./linux-3.6.patch ];
 
   buildInputs = [ perl kernel autoconf automake libtool ];