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

Build userspace packages using the userspace zfs

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-07 15:03:59 -08:00
parent f177036817
commit 15cf03a8ee
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/grub/2.0x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
, gettext, ncurses, libusb, freetype, qemu, devicemapper , gettext, ncurses, libusb, freetype, qemu, devicemapper
, linuxPackages ? null , zfs ? null
, efiSupport ? false , efiSupport ? false
, zfsSupport ? false , zfsSupport ? false
}: }:
@ -32,7 +32,7 @@ let
in ( in (
assert efiSupport -> canEfi; assert efiSupport -> canEfi;
assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; assert zfsSupport -> zfs != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${prefix}-${version}"; name = "${prefix}-${version}";
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autogen flex bison python autoconf automake ]; nativeBuildInputs = [ autogen flex bison python autoconf automake ];
buildInputs = [ ncurses libusb freetype gettext devicemapper ] buildInputs = [ ncurses libusb freetype gettext devicemapper ]
++ optional doCheck qemu ++ optional doCheck qemu
++ optional zfsSupport linuxPackages.zfs; ++ optional zfsSupport zfs;
preConfigure = preConfigure =
'' for i in "tests/util/"*.in '' for i in "tests/util/"*.in

8
pkgs/top-level/all-packages.nix
View File

@ -867,9 +867,7 @@ let
cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
ceph = callPackage ../tools/filesystems/ceph { ceph = callPackage ../tools/filesystems/ceph { };
zfs = linuxPackages.zfs;
};
cfdg = builderDefsPackage ../tools/graphics/cfdg { cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex ffmpeg; inherit libpng bison flex ffmpeg;
@ -3055,9 +3053,7 @@ let
zdelta = callPackage ../tools/compression/zdelta { }; zdelta = callPackage ../tools/compression/zdelta { };
zfstools = callPackage ../tools/filesystems/zfstools { zfstools = callPackage ../tools/filesystems/zfstools { };
zfs = linuxPackages.zfs;
};
zile = callPackage ../applications/editors/zile { }; zile = callPackage ../applications/editors/zile { };