diff options
author | Jack Cummings <jack@mudshark.org> | 2012-10-13 21:19:53 -0700 |
---|---|---|
committer | David Guibert <david.guibert@gmail.com> | 2012-11-15 07:41:11 +0100 |
commit | abd60461685e50968f9462d067d2b7109707abb8 (patch) | |
tree | 203505c9bfb7536958152d2791928d47ee0cadc3 | |
parent | 66ceb14b5ecb06538105fce66f12bc17828554d5 (diff) | |
download | nixlib-abd60461685e50968f9462d067d2b7109707abb8.tar nixlib-abd60461685e50968f9462d067d2b7109707abb8.tar.gz nixlib-abd60461685e50968f9462d067d2b7109707abb8.tar.bz2 nixlib-abd60461685e50968f9462d067d2b7109707abb8.tar.lz nixlib-abd60461685e50968f9462d067d2b7109707abb8.tar.xz nixlib-abd60461685e50968f9462d067d2b7109707abb8.tar.zst nixlib-abd60461685e50968f9462d067d2b7109707abb8.zip |
- fix spl license, add workarounds for zfs on i686-linux
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 63a2a8454aa0..16fe040e7be0 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 4c13320f6d80..1c930a29dd76 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 = { |