tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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

Luca Bruno 0abe34e4 5e6e6372

+5 -4
unified split
+3 -2
pkgs/applications/virtualization/OVMF/default.nix
··· 1 - { stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: 1 + { stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }: 2 2 3 3 let 4 4 ··· 15 15 name = "OVMF-2014-12-10"; 16 16 17 17 # TODO: properly include openssl for secureBoot 18 - buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; 18 + # Doesn't build with gcc 4.9 19 + buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; 19 20 20 21 unpackPhase = '' 21 22 for file in \
+2 -2
pkgs/top-level/all-packages.nix
··· 9059 9059 9060 9060 qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; 9061 9061 9062 - OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; }; 9063 - OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; }; 9062 + OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; }; 9063 + OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; }; 9064 9064 #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; 9065 9065 9066 9066 seabios = callPackage ../applications/virtualization/seabios { };