JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "OVMF: build with gcc 4.8, I'm no idea what I'm doing (ZHF)"

Browse Source 
This reverts commit 0abe34e454.
This commit is contained in:
Luca Bruno 2015-07-22 11:58:02 +02:00
parent befef13d37
commit 58430f3259
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/virtualization/OVMF/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }: { stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
let let
@ -15,8 +15,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
name = "OVMF-2014-12-10"; name = "OVMF-2014-12-10";
# TODO: properly include openssl for secureBoot # TODO: properly include openssl for secureBoot
# Doesn't build with gcc 4.9 buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
unpackPhase = '' unpackPhase = ''
for file in \ for file in \

4
pkgs/top-level/all-packages.nix
View File

@ -9059,8 +9059,8 @@ let
qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; }; OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; }; OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
#WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
seabios = callPackage ../applications/virtualization/seabios { }; seabios = callPackage ../applications/virtualization/seabios { };