Skip to content

Commit 55bdafd

Browse files
phip1611scholzp
authored andcommitted
nix/chv: minor cleanup of derivation
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de> On-behalf-of: SAP philipp.schuster@sap.com
1 parent c14b22d commit 55bdafd

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

chv.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ let
1616

1717
commonArgs = {
1818
meta = cloud-hypervisor-meta;
19-
2019
src = craneLib'.cleanCargoSource cloud-hypervisor-src;
2120

2221
# Pragmatic release profile with debug-ability and faster
@@ -26,6 +25,11 @@ let
2625
CARGO_PROFILE_RELEASE_OPT_LEVEL = 2;
2726
CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS = "true";
2827
CARGO_PROFILE_RELEASE_LTO = "no";
28+
29+
# Fix build. Reference:
30+
# - https://github.com/sfackler/rust-openssl/issues/1430
31+
# - https://docs.rs/openssl/latest/openssl/
32+
OPENSSL_NO_VENDOR = true;
2933
};
3034

3135
nativeBuildInputs = [
@@ -34,18 +38,12 @@ let
3438
buildInputs = [
3539
openssl
3640
];
37-
# Fix build. Reference:
38-
# - https://github.com/sfackler/rust-openssl/issues/1430
39-
# - https://docs.rs/openssl/latest/openssl/
40-
OPENSSL_NO_VENDOR = true;
4141
};
4242

4343
# Downloaded and compiled dependencies.
4444
cargoArtifacts = craneLib'.buildDepsOnly (
4545
commonArgs
4646
// {
47-
# "suffix '-deps' will be appended
48-
pname = "cloud-hypervisor";
4947
doCheck = false;
5048
}
5149
);
@@ -54,8 +52,8 @@ let
5452
commonArgs
5553
// {
5654
inherit cargoArtifacts;
57-
pname = "cloud-hypervisor";
58-
# Don't execute tests here. We want this in a dedicated step.
55+
# Don't execute tests here. Too expensive for local development with
56+
# frequent rebuilds + little benefit.
5957
doCheck = false;
6058
cargoExtraArgs = "--features kvm";
6159
}

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)