diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 479d625c7de..715073351f1 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, secureBoot ? false }: +{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }: let @@ -15,7 +15,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { name = "OVMF-2014-12-10"; # TODO: properly include openssl for secureBoot - buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; + # Doesn't build with gcc 4.9 + buildInputs = [nasm iasl gcc] ++ 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 3cf462adeb3..d412cbbce8f 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; }; - OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; }; + OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; }; + OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; }; #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; seabios = callPackage ../applications/virtualization/seabios { };