diff options
| author | Kirill Elagin <kirelagin@gmail.com> | 2019-11-03 13:24:57 +0300 |
|---|---|---|
| committer | Kirill Elagin <kirelagin@gmail.com> | 2019-11-03 13:29:30 +0300 |
| commit | 7cacaea1db76e3e3969e12ae62a17d4399b649f4 (patch) | |
| tree | aea6c9bf6c942013cfa37d9085bdd50d7a067243 /pkgs/development/libraries/gnu-efi | |
| parent | 7827d3f4497ed722fedca57fd4d5ca1a65c38256 (diff) | |
| download | nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.tar nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.tar.gz nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.tar.bz2 nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.tar.lz nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.tar.xz nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.tar.zst nixpkgs-7cacaea1db76e3e3969e12ae62a17d4399b649f4.zip | |
gnu-efi: Use their crosscompilation support correctly
IIUC, previously, the cross-compilation support was done in a somewhat hacky way and was, basically, special-cased for ARM. Now we use the cross-compilation support intergrated into their own build system. Test: * nix-build --arg crossSystem '(import <nixpkgs/lib>).systems.examples.musl64' '<nixpkgs>' -A gnu-efi
Diffstat (limited to 'pkgs/development/libraries/gnu-efi')
| -rw-r--r-- | pkgs/development/libraries/gnu-efi/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index af225cc50f2..6ae1f47e38c 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pciutils }: with stdenv.lib; +{ stdenv, buildPackages, fetchurl, pciutils }: + +with stdenv.lib; stdenv.mkDerivation rec { pname = "gnu-efi"; @@ -15,14 +17,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=\${out}" - "CC=${stdenv.cc.targetPrefix}gcc" - "AS=${stdenv.cc.targetPrefix}as" - "LD=${stdenv.cc.targetPrefix}ld" - "AR=${stdenv.cc.targetPrefix}ar" - "RANLIB=${stdenv.cc.targetPrefix}ranlib" - "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm" - ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; + "HOSTCC=${buildPackages.stdenv.cc.targetPrefix}cc" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; meta = with stdenv.lib; { description = "GNU EFI development toolchain"; |