public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix spl license, add workarounds for zfs on i686-linux

Browse Source
This commit is contained in:
Jack Cummings 2012-10-13 21:19:53 -07:00 committed by David Guibert
parent 66ceb14b5e
commit abd6046168
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/spl/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation {
homepage = http://zfsonlinux.org/; homepage = http://zfsonlinux.org/;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.cddl; license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ jcumming ]; maintainers = with stdenv.lib.maintainers; [ jcumming ];
}; };
} }

1
pkgs/os-specific/linux/zfs/default.nix
View File

@ -25,6 +25,7 @@ stdenv.mkDerivation {
--with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux=${kernel}/lib/modules/${kernel.version}/build
--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build
--with-spl=${spl}/libexec/spl/${kernel.version} --with-spl=${spl}/libexec/spl/${kernel.version}
${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""}
''; '';
meta = { meta = {