Build userspace packages using the userspace zfs
This commit is contained in:
parent
f177036817
commit
15cf03a8ee
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
|
||||
, gettext, ncurses, libusb, freetype, qemu, devicemapper
|
||||
, linuxPackages ? null
|
||||
, zfs ? null
|
||||
, efiSupport ? false
|
||||
, zfsSupport ? false
|
||||
}:
|
||||
@ -32,7 +32,7 @@ let
|
||||
in (
|
||||
|
||||
assert efiSupport -> canEfi;
|
||||
assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
|
||||
assert zfsSupport -> zfs != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${prefix}-${version}";
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autogen flex bison python autoconf automake ];
|
||||
buildInputs = [ ncurses libusb freetype gettext devicemapper ]
|
||||
++ optional doCheck qemu
|
||||
++ optional zfsSupport linuxPackages.zfs;
|
||||
++ optional zfsSupport zfs;
|
||||
|
||||
preConfigure =
|
||||
'' for i in "tests/util/"*.in
|
||||
|
@ -867,9 +867,7 @@ let
|
||||
|
||||
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
|
||||
|
||||
ceph = callPackage ../tools/filesystems/ceph {
|
||||
zfs = linuxPackages.zfs;
|
||||
};
|
||||
ceph = callPackage ../tools/filesystems/ceph { };
|
||||
|
||||
cfdg = builderDefsPackage ../tools/graphics/cfdg {
|
||||
inherit libpng bison flex ffmpeg;
|
||||
@ -3055,9 +3053,7 @@ let
|
||||
|
||||
zdelta = callPackage ../tools/compression/zdelta { };
|
||||
|
||||
zfstools = callPackage ../tools/filesystems/zfstools {
|
||||
zfs = linuxPackages.zfs;
|
||||
};
|
||||
zfstools = callPackage ../tools/filesystems/zfstools { };
|
||||
|
||||
zile = callPackage ../applications/editors/zile { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user