Merge pull request #225637 from NixOS/kvmtool_bump_aarch64_support
This commit is contained in:
commit
cbcbefbced
@ -1,23 +1,33 @@
|
|||||||
{ stdenv, fetchgit, lib }:
|
{ stdenv, fetchgit, lib, dtc }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "kvmtool";
|
pname = "kvmtool";
|
||||||
version = "unstable-2022-06-09";
|
version = "unstable-2023-04-06";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
|
url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
|
||||||
rev = "f44af23e3a62e46158341807b0d2d132249b96a8";
|
rev = "77b108c6a6f1c66fb7f60a80d17596bb80bda8ad";
|
||||||
sha256 = "sha256-M83dCCXU/fkh21x10vx6BLg9Wja1714qW7yxl5zY6z0=";
|
sha256 = "sha256-wPhqjVpc6I9UOdb6lmzGh797sdvJ5q4dap2ssg8OY5E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
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; {
|
meta = with lib; {
|
||||||
description = "A lightweight tool for hosting KVM guests";
|
description = "A lightweight tool for hosting KVM guests";
|
||||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README";
|
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README";
|
||||||
license = licenses.gpl2Only;
|
license = licenses.gpl2Only;
|
||||||
maintainers = with maintainers; [ astro ];
|
maintainers = with maintainers; [ astro ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user