From 0b581b1626693f428d3d78118e1a7260e6c8a5e1 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 19 Jun 2024 14:03:48 -0700 Subject: [PATCH] kvmtool: cleanup make flags The make flags CROSS_COMPILE and ARCH can be unconditionally set and we can use attributes under `stdenv` to apply the correct values. --- pkgs/applications/virtualization/kvmtool/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index dc16ce6b2c0c..880334294af6 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -18,11 +18,10 @@ stdenv.mkDerivation { makeFlags = [ "prefix=${placeholder "out"}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 ([ "LIBFDT_DIR=${dtc}/lib" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "CROSS_COMPILE=aarch64-unknown-linux-gnu-" - "ARCH=arm64" ]); meta = with lib; {