Merge #1760

1760: build: add rustFlags option to support rust compiler options r=niladrih a=niladrih



Co-authored-by: Niladri Halder <[email protected]>

default.nix

@@ -3,14 +3,15 @@
 , tag ? ""
 , img_org ? ""
 , product_prefix ? ""
+, rustFlags ? ""
 }:
 
 let
   sources = import ./nix/sources.nix;
   pkgs = import sources.nixpkgs {
     overlays = [
       (_: _: { inherit sources; })
-      (import ./nix/overlay.nix { inherit img_tag tag img_org product_prefix; })
+      (import ./nix/overlay.nix { inherit img_tag tag img_org product_prefix rustFlags; })
     ];
     inherit crossSystem;
   };

nix/overlay.nix

@@ -1,17 +1,17 @@
-{ img_tag ? "", tag ? "", img_org ? "", product_prefix ? "" }:
+{ img_tag ? "", tag ? "", img_org ? "", product_prefix ? "", rustFlags ? "" }:
 let
   config = import ./config.nix;
   img_prefix = if product_prefix == "" then config.product_prefix else product_prefix;
 in
 self: super: rec {
   sourcer = super.callPackage ./lib/sourcer.nix { };
   images = super.callPackage ./pkgs/images { inherit img_tag img_org img_prefix; };
-  io-engine = (super.callPackage ./pkgs/io-engine { inherit tag sourcer; }).release;
-  io-engine-adhoc = (super.callPackage ./pkgs/io-engine { inherit tag; }).adhoc;
-  io-engine-dev = (super.callPackage ./pkgs/io-engine { inherit tag; }).debug;
+  io-engine = (super.callPackage ./pkgs/io-engine { inherit tag sourcer rustFlags; }).release;
+  io-engine-adhoc = (super.callPackage ./pkgs/io-engine { inherit tag rustFlags; }).adhoc;
+  io-engine-dev = (super.callPackage ./pkgs/io-engine { inherit tag rustFlags; }).debug;
   mkContainerEnv = super.callPackage ./lib/mkContainerEnv.nix { };
   ms-buildenv = super.callPackage ./pkgs/ms-buildenv { };
   nvmet-cli = super.callPackage ./pkgs/nvmet-cli { };
-  units = (super.callPackage ./pkgs/io-engine/units.nix { inherit tag sourcer; });
+  units = (super.callPackage ./pkgs/io-engine/units.nix { inherit tag sourcer rustFlags; });
 }
   // (import ../spdk-rs/nix/overlay.nix { } self super)

nix/pkgs/io-engine/cargo-package.nix

@@ -29,6 +29,7 @@
 , systemdMinimal
 , rdma-core
 , cargoBuildFlags ? [ ]
+, rustFlags
 }:
 let
   version = versions.version;
@@ -106,12 +107,14 @@ in
     cargoBuildFlags = "--bin io-engine --bin io-engine-client --bin casperf";
     buildType = "release";
     buildInputs = buildProps.buildInputs ++ [ libspdk ];
+    ${if rustFlags == "" then null else "RUSTFLAGS"} = builtins.split " " rustFlags;
     SPDK_ROOT_DIR = "${libspdk}";
   });
   debug = rustPlatform.buildRustPackage (buildProps // {
     cargoBuildFlags = "--workspace --bins --exclude io-engine-bench";
     buildType = "debug";
     buildInputs = buildProps.buildInputs ++ [ libspdk-dev ];
+    ${if rustFlags == "" then null else "RUSTFLAGS"} = builtins.split " " rustFlags;
     SPDK_ROOT_DIR = "${libspdk-dev}";
   });
 }

nix/pkgs/io-engine/default.nix

@@ -4,6 +4,7 @@
 , git
 , tag
 , sourcer
+, rustFlags
 }:
 let
   versionDrv = import ../../lib/version.nix { inherit lib stdenv git tag sourcer; };
@@ -12,7 +13,7 @@ let
     "long" = builtins.readFile "${versionDrv.long}";
     "tag_or_long" = builtins.readFile "${versionDrv.tag_or_long}";
   };
-  project-builder = pkgs.callPackage ./cargo-package.nix { inherit versions; };
+  project-builder = pkgs.callPackage ./cargo-package.nix { inherit versions rustFlags; };
 in
 {
   release = project-builder.release;

nix/pkgs/io-engine/units.nix

@@ -4,6 +4,7 @@
 , git
 , tag
 , sourcer
+, rustFlags
 }:
 let
   versionDrv = import ../../lib/version.nix { inherit lib stdenv git tag sourcer; };
@@ -12,7 +13,7 @@ let
     "long" = builtins.readFile "${versionDrv.long}";
     "tag_or_long" = builtins.readFile "${versionDrv.tag_or_long}";
   };
-  project-builder = { cargoBuildFlags ? [ ] }: pkgs.callPackage ./cargo-package.nix { inherit versions cargoBuildFlags; };
+  project-builder = { cargoBuildFlags ? [ ] }: pkgs.callPackage ./cargo-package.nix { inherit versions cargoBuildFlags rustFlags; };
   components = { build }: {
     io-engine = (project-builder { cargoBuildFlags = [ "--bin io-engine" ]; }).${build};
     io-engine-cli = (project-builder { cargoBuildFlags = [ "--bin io-engine-cli" ]; }).${build};