From 3e09239882d84a26b4d9d9597b54682412992263 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 26 May 2018 20:44:38 +0200 Subject: [PATCH] grub2: compile grub-mount as well It is a dependency of os-prober >= 1.75 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23 --- pkgs/tools/misc/grub/2.0x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 96ce38ea9e8..84c06a49f84 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +, fuse # only needed for grub-mount , zfs ? null , efiSupport ? false , zfsSupport ? true @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -83,7 +84,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; - configureFlags = optional zfsSupport "--enable-libzfs" + configureFlags = [ "--enable-grub-mount" ] # dep of os-prober + ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ] ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"];