From 95bec1c0019e7317572296a8a2842335f94a45b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 06:08:55 +0000
Subject: [PATCH] efiBootStub: Properly handle the removableMediaImage path on
 different architectures

svn path=/nixos/trunk/; revision=33141
---
 modules/installer/efi-boot-stub/efi-boot-stub.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index 7b28faa9ab2..7f4d8cba775 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -87,12 +87,12 @@ let
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
     inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
     kernelFile = platform.kernelTarget;
-  } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage {
-    removableMediaImage = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
+  } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage rec {
+    removableMediaImage = "${pkgs.NixosBootPkg}/${targetArch}/NixosBoot.efi";
     targetArch = if pkgs.stdenv.isi686 then
       "IA32"
     else if pkgs.stdenv.isx86_64 then
-      "x64"
+      "X64"
     else
       throw "Unsupported architecture";
   });