diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-07-22 11:34:18 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-07-22 11:34:27 +0200 |
commit | 0abe34e4543125f62ef3335fb3bc065e2df996db (patch) | |
tree | 63de3492836d495b9f051b377b389296a4af74a4 /pkgs | |
parent | 5e6e63727e5a0cd7fd37bc692373bb403d16b77f (diff) | |
download | nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.tar nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.tar.gz nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.tar.bz2 nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.tar.lz nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.tar.xz nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.tar.zst nixlib-0abe34e4543125f62ef3335fb3bc065e2df996db.zip |
OVMF: build with gcc 4.8, I'm no idea what I'm doing (ZHF)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/OVMF/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 479d625c7de7..715073351f17 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 3cf462adeb39..d412cbbce8f5 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 { }; |