From 866fa68c4044c78ae033b2dc1227ef06b2a6cfa1 Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Sun, 9 Apr 2023 18:45:14 +0300 Subject: [PATCH] kvmtool: unstable-2022-06-09 -> unstable-2023-04-06 Also added support for aarch64-linux and cross-compilation Signed-off-by: Mika Tammi --- .../virtualization/kvmtool/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index 29579a70cde4..bf134e2cb07c 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -1,23 +1,33 @@ -{ stdenv, fetchgit, lib }: +{ stdenv, fetchgit, lib, dtc }: stdenv.mkDerivation { pname = "kvmtool"; - version = "unstable-2022-06-09"; + version = "unstable-2023-04-06"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; - rev = "f44af23e3a62e46158341807b0d2d132249b96a8"; - sha256 = "sha256-M83dCCXU/fkh21x10vx6BLg9Wja1714qW7yxl5zY6z0="; + rev = "77b108c6a6f1c66fb7f60a80d17596bb80bda8ad"; + sha256 = "sha256-wPhqjVpc6I9UOdb6lmzGh797sdvJ5q4dap2ssg8OY5E="; }; + buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ]; + enableParallelBuilding = true; - makeFlags = [ "prefix=${placeholder "out"}" ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + ] ++ 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; { description = "A lightweight tool for hosting KVM guests"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; license = licenses.gpl2Only; maintainers = with maintainers; [ astro ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; }