diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 12:58:37 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 12:58:37 +0400 |
| commit | 94205f5f21c4d9942bb4205c06229438051b6853 (patch) | |
| tree | e23520f5a9c566e074426454a844d20087437098 /pkgs/top-level | |
| parent | 347dd52019d57ae15c25d56a36aa881c0badc05f (diff) | |
| download | nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.gz nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.bz2 nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.lz nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.xz nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.zst nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.zip | |
Revert "Merge pull request #2449 from wkennington/master.grub"
This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing changes made to 0078bc5d8f87512104902eab00c8a44bef286067. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e97c0fe3d..6ceca8e0c20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1226,11 +1226,9 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; }; - grub2_efi = grub2.override { efiSupport = true; }; - - grub2_zfs = grub2.override { zfsSupport = true; }; + grub2_efi = grub2.override { EFIsupport = true; }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; |