diff options
author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
---|---|---|
committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/tools/misc/grub | |
parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
download | nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
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 84c06a49f84..58c9f18ec5a 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] + buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 2bf7e3dcf43..63a73658e0a 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, devicemapper +, gettext, ncurses, libusb, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; |