diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-24 23:43:10 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-24 23:43:10 +0200 |
| commit | 649ce300e3fcc62a44f298dfa3eec6cad4b291c0 (patch) | |
| tree | 4a237d4a16a0b0a0a1bdfca3b1d345b8e44d6f72 /pkgs/tools | |
| parent | 75ea4778f5dcb571099c4cd62b34693a88f817a5 (diff) | |
| parent | f44add691155639fdfd5570043799b0218587fb6 (diff) | |
| download | nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.tar nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.tar.gz nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.tar.bz2 nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.tar.lz nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.tar.xz nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.tar.zst nixlib-649ce300e3fcc62a44f298dfa3eec6cad4b291c0.zip | |
Merge pull request #7587 from dezgeg/pr-refind
refind: Fix build on i686
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/bootloaders/refind/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 85a544ccd4c8..aa44c1924bf6 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -26,9 +26,13 @@ stdenv.mkDerivation rec { sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi ''; - buildPhase = '' - make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/elf_x86_64_efi.lds gnuefi fs_gnuefi - ''; + buildPhase = + let ldScript = + if stdenv.system == "x86_64-linux" then "elf_x86_64_efi.lds" + else if stdenv.system == "i686-linux" then "elf_ia32_efi.lds" else "null"; + in '' + make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi + ''; installPhase = '' install -d $out/bin/ |