colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnu-efi: Fix aarch64 cross-build

Browse Source
This commit is contained in:
Shea Levy 2018-02-24 22:15:48 -05:00
parent 87270fb306
commit 0ac6d4aeb6
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/systems/inspect.nix
View File

@ -38,7 +38,8 @@ rec {
Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; }) Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ]; [ "x86" "arm" "aarch64" "mips" ];
Efi = map (family: { cpu.family = family; }) [ "x86" "arm" ]; Efi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ];
}; };
matchAnyAttrs = patterns: matchAnyAttrs = patterns:

15
pkgs/development/libraries/gnu-efi/default.nix
View File

@ -15,13 +15,14 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"PREFIX=\${out}" "PREFIX=\${out}"
"CC=gcc" "CC=${stdenv.cc.targetPrefix}gcc"
"AS=as" "AS=${stdenv.cc.targetPrefix}as"
"LD=ld" "LD=${stdenv.cc.targetPrefix}ld"
"AR=ar" "AR=${stdenv.cc.targetPrefix}ar"
"RANLIB=ranlib" "RANLIB=${stdenv.cc.targetPrefix}ranlib"
"OBJCOPY=objcopy" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"; ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"
++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNU EFI development toolchain"; description = "GNU EFI development toolchain";