Skip to content

Commit 2205496

Browse files
committed
chv: improve derivation build
We now have much more explicit control over the compilation options, independent of what Cloud Hypervisor's Cargo.toml defines in its Cargo.toml. Further, this does some cleanup to prepare the upgrade to v50, which requires a few minor changes in how Cloud Hypervisor is build. On-behalf-of: SAP philipp.schuster@sap.com Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
1 parent d14a5fe commit 2205496

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

chv.nix

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ let
1515
craneLib' = craneLib.overrideToolchain rustToolchain;
1616

1717
commonArgs = {
18-
meta = cloud-hypervisor-meta;
19-
2018
src = craneLib'.cleanCargoSource cloud-hypervisor-src;
19+
meta = cloud-hypervisor-meta;
2120

2221
# Pragmatic release profile with debug-ability and faster
2322
# compilation times in mind.
@@ -44,8 +43,6 @@ let
4443
cargoArtifacts = craneLib'.buildDepsOnly (
4544
commonArgs
4645
// {
47-
# "suffix '-deps' will be appended
48-
pname = "cloud-hypervisor";
4946
doCheck = false;
5047
}
5148
);
@@ -54,8 +51,7 @@ let
5451
commonArgs
5552
// {
5653
inherit cargoArtifacts;
57-
pname = "cloud-hypervisor";
58-
# Don't execute tests here. We want this in a dedicated step.
54+
# Don't execute unit tests here.
5955
doCheck = false;
6056
cargoExtraArgs = "--features kvm";
6157
}

0 commit comments

Comments
 (0)