From 80f47974b7edf27f7eaa6e16f094591ff6e87b0b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 14 Mar 2012 07:29:11 +0000 Subject: [PATCH] OVMF: Actually support i686 svn path=/nixpkgs/trunk/; revision=33060 --- pkgs/applications/virtualization/OVMF/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index a22d9737083e..4b6f77f5f8dd 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,6 +1,17 @@ { stdenv, edk2 }: -stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkgX64.dsc" { +let + + targetArch = if stdenv.isi686 then + "Ia32" + else if stdenv.isx86_64 then + "X64" + else + throw "Unsupported architecture"; + +in + +stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { name = "OVMF-2012-03-13"; src = edk2.src;