diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-05 14:17:37 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-05 14:17:37 +0100 |
| commit | 03a9822405d1293e8e5dd90b5da076d9ce52265f (patch) | |
| tree | 2939f7adac7ae6dc121541fc16e1e0a603f64542 /pkgs/development/libraries/gnu-efi | |
| parent | 57a079ab30fbd95bb65900740b258c0a600f8912 (diff) | |
| parent | 54c0ac553ef9279489cf4acd63b22b38e5d0328a (diff) | |
| download | nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.tar nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.tar.gz nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.tar.bz2 nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.tar.lz nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.tar.xz nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.tar.zst nixpkgs-03a9822405d1293e8e5dd90b5da076d9ce52265f.zip | |
Merge master into staging-next
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 9c9f19b124d..0d704f74c1e 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"; |