diff options
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 1dbdfff7448d..4ba1a949c457 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe394ea61772..b51999388f52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |