From 58430f3259d59c902d916a3fbf85fb17ed28725e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 22 Jul 2015 11:58:02 +0200 Subject: [PATCH] Revert "OVMF: build with gcc 4.8, I'm no idea what I'm doing (ZHF)" This reverts commit 0abe34e4543125f62ef3335fb3bc065e2df996db. --- pkgs/applications/virtualization/OVMF/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 715073351f17..479d625c7de7 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }: +{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: let @@ -15,8 +15,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { name = "OVMF-2014-12-10"; # TODO: properly include openssl for secureBoot - # Doesn't build with gcc 4.9 - buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; + buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; unpackPhase = '' for file in \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d412cbbce8f5..3cf462adeb39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9059,8 +9059,8 @@ let qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; - OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; }; - OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; }; + OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; }; + OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; }; #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; seabios = callPackage ../applications/virtualization/seabios { };