diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-28 05:29:39 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-28 05:33:41 +0200 |
| commit | e89e2edc7349c0df15fa03b8229c370340547538 (patch) | |
| tree | 69805e409dd120efa67e2bf0fbd19d698835ac9a /pkgs/tools/misc/grub | |
| parent | 4f422e4efb539a88f978603d375a80f08b5270dc (diff) | |
| download | nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.gz nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.bz2 nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.lz nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.xz nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.zst nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.zip | |
libusb-compat-0_1: rename from libusb
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/trusted.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index a64df866981..4e00a4ddd49 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 27676c4745b..f14758a3ae7 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, lvm2 +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; |