diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
| commit | 8dca8b9ccb05e7abe6b769485a4d224987c15c06 (patch) | |
| tree | 80f8e212628d458ecc6d9e9af22661813eed8aa7 /pkgs/development/libraries/gnu-efi/default.nix | |
| parent | 1ba64dad7c7b29a03ace672b2ff1a01343e853fe (diff) | |
| parent | 22906321fbc0d38372d7ae2657adb2597fc384c1 (diff) | |
| download | nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.gz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.bz2 nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.lz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.xz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.zst nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.zip | |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/development/libraries/gnu-efi/default.nix')
| -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"; |