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 [email protected]
Signed-off-by: Philipp Schuster <[email protected]>

Author: phip1611

chv.nix

@@ -14,38 +14,35 @@ let
   # Crane lib with proper Rust toolchain
   craneLib' = craneLib.overrideToolchain rustToolchain;
 
-  commonArgs = {
-    meta = cloud-hypervisor-meta;
+  commonArgs =  {
+      src = craneLib'.cleanCargoSource cloud-hypervisor-src;
+      meta = cloud-hypervisor-meta;
 
-    src = craneLib'.cleanCargoSource cloud-hypervisor-src;
+      # Pragmatic release profile with debug-ability and faster
+      # compilation times in mind.
+      env = {
+        CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS = "true";
+        CARGO_PROFILE_RELEASE_OPT_LEVEL = 2;
+        CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS = "true";
+        CARGO_PROFILE_RELEASE_LTO = "no";
+      };
 
-    # Pragmatic release profile with debug-ability and faster
-    # compilation times in mind.
-    env = {
-      CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS = "true";
-      CARGO_PROFILE_RELEASE_OPT_LEVEL = 2;
-      CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS = "true";
-      CARGO_PROFILE_RELEASE_LTO = "no";
+      nativeBuildInputs = [
+        pkg-config
+      ];
+      buildInputs = [
+        openssl
+      ];
+      # Fix build. Reference:
+      # - https://github.com/sfackler/rust-openssl/issues/1430
+      # - https://docs.rs/openssl/latest/openssl/
+      OPENSSL_NO_VENDOR = true;
     };
 
-    nativeBuildInputs = [
-      pkg-config
-    ];
-    buildInputs = [
-      openssl
-    ];
-    # Fix build. Reference:
-    # - https://github.com/sfackler/rust-openssl/issues/1430
-    # - https://docs.rs/openssl/latest/openssl/
-    OPENSSL_NO_VENDOR = true;
-  };
-
   # Downloaded and compiled dependencies.
   cargoArtifacts = craneLib'.buildDepsOnly (
     commonArgs
     // {
-      # "suffix '-deps' will be appended
-      pname = "cloud-hypervisor";
       doCheck = false;
     }
   );
@@ -54,8 +51,8 @@ let
     commonArgs
     // {
       inherit cargoArtifacts;
-      pname = "cloud-hypervisor";
-      # Don't execute tests here. We want this in a dedicated step.
+      # Don't execute tests here. Too expensive for local development with
+      # frequent rebuilds + little benefit.
       doCheck = false;
       cargoExtraArgs = "--features kvm";
     }