From abd60461685e50968f9462d067d2b7109707abb8 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sat, 13 Oct 2012 21:19:53 -0700
Subject: [PATCH]  - fix spl license, add workarounds for zfs on i686-linux

---
 pkgs/os-specific/linux/spl/default.nix | 2 +-
 pkgs/os-specific/linux/zfs/default.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 63a2a8454aa..16fe040e7be 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
 
     homepage = http://zfsonlinux.org/;
     platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.cddl;
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 4c13320f6d8..1c930a29dd7 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
     --with-linux=${kernel}/lib/modules/${kernel.version}/build 
     --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build 
     --with-spl=${spl}/libexec/spl/${kernel.version}
+    ${if stdenv.system == "i686-linux"  then "--enable-atomic-spinlocks" else ""}
   '';
 
   meta = {