diff options
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/spl/const.patch | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch new file mode 100644 index 000000000000..3bfcaa22b13c --- /dev/null +++ b/pkgs/os-specific/linux/spl/const.patch @@ -0,0 +1,13 @@ +diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c +index f25239a..b731123 100644 +--- a/module/spl/spl-proc.c ++++ b/module/spl/spl-proc.c +@@ -38,7 +38,7 @@ + + #define SS_DEBUG_SUBSYS SS_PROC + +-#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) ++#if defined(CONSTIFY_PLUGIN) + typedef struct ctl_table __no_const spl_ctl_table; + #else + typedef struct ctl_table spl_ctl_table; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 1d70a76a001c..e74d0f0ef752 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw"; }; - patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ]; + patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { longDescription = '' This kernel module is a porting layer for ZFS to work inside the linux - kernel. + kernel. ''; homepage = http://zfsonlinux.org/; |