feat: per platform extra options for pixi build configuration

crates/pixi_build_discovery/Cargo.toml

@@ -13,6 +13,7 @@ version = "0.1.0"
 dunce = { workspace = true }
 itertools = { workspace = true }
 miette = { workspace = true }
+ordermap = { workspace = true }
 pathdiff = { workspace = true }
 serde = { workspace = true, optional = true, features = ["derive"] }
 serde_json = { workspace = true }

crates/pixi_build_discovery/src/discovery.rs

@@ -5,8 +5,9 @@ use std::{
 
 use itertools::Itertools;
 use miette::Diagnostic;
-use pixi_build_type_conversions::to_project_model_v1;
-use pixi_build_types::ProjectModelV1;
+use ordermap::OrderMap;
+use pixi_build_type_conversions::{to_project_model_v1, to_target_selector_v1};
+use pixi_build_types::{ProjectModelV1, TargetSelectorV1};
 use pixi_manifest::{
     DiscoveryStart, ExplicitManifestError, PackageManifest, PrioritizedChannel, WithProvenance,
     WorkspaceDiscoverer, WorkspaceDiscoveryError, WorkspaceManifest,
@@ -53,6 +54,9 @@ pub struct BackendInitializationParams {
 
     /// Additional configuration that applies to the backend.
     pub configuration: Option<serde_json::Value>,
+
+    /// Targets that apply to the backend.
+    pub target_configuration: Option<OrderMap<TargetSelectorV1, serde_json::Value>>,
 }
 
 /// Configuration to enable or disable certain protocols discovery.
@@ -169,12 +173,13 @@ impl DiscoveredBackend {
                 manifest_path: recipe_relative_path,
                 project_model: None,
                 configuration: None,
+                target_configuration: None,
             },
         })
     }
 
     /// Convert a package manifest and corresponding workspace manifest into a
-    /// discovered backend.
+    /// discovered backend, with optional platform-specific configuration.
     pub fn from_package_and_workspace(
         source_path: PathBuf,
         package_manifest: &WithProvenance<PackageManifest>,
@@ -247,7 +252,19 @@ impl DiscoveredBackend {
                 configuration: build_system.configuration.map(|config| {
                     config
                         .deserialize_into()
-                        .expect("Configuration dictionary should be serializable to JSON")
+                        .expect("Configuration dictionary needs to be serializable to JSON")
+                }),
+                target_configuration: build_system.target_configuration.map(|c| {
+                    c.into_iter()
+                        .map(|(selector, config)| {
+                            (
+                                to_target_selector_v1(&selector),
+                                config.deserialize_into().expect(
+                                    "Configuration dictionary needs to be serializable to JSON",
+                                ),
+                            )
+                        })
+                        .collect()
                 }),
             },
         })

crates/pixi_build_discovery/tests/snapshots/discovery__direct_recipe.snap

@@ -18,3 +18,4 @@ init-params:
   manifest-path: recipe.yaml
   project-model: ~
   configuration: ~
+  target-configuration: ~

crates/pixi_build_discovery/tests/snapshots/discovery__discovery@inherit__nested.snap

@@ -34,3 +34,4 @@ init-params:
         runDependencies: {}
       targets: {}
   configuration: ~
+  target-configuration: ~

crates/pixi_build_discovery/tests/snapshots/discovery__discovery@nested__nested.snap

@@ -34,3 +34,4 @@ init-params:
         runDependencies: {}
       targets: {}
   configuration: ~
+  target-configuration: ~

crates/pixi_build_discovery/tests/snapshots/discovery__discovery@nested_recipe_yml.snap

@@ -19,3 +19,4 @@ init-params:
   manifest-path: recipe/recipe.yml
   project-model: ~
   configuration: ~
+  target-configuration: ~

crates/pixi_build_discovery/tests/snapshots/discovery__discovery@recipe_yaml.snap

@@ -19,3 +19,4 @@ init-params:
   manifest-path: recipe.yaml
   project-model: ~
   configuration: ~
+  target-configuration: ~

crates/pixi_build_discovery/tests/snapshots/discovery__discovery@recipe_yml.snap

@@ -19,3 +19,4 @@ init-params:
   manifest-path: recipe.yml
   project-model: ~
   configuration: ~
+  target-configuration: ~

crates/pixi_build_discovery/tests/snapshots/discovery__discovery@simple.snap

@@ -34,3 +34,4 @@ init-params:
         runDependencies: {}
       targets: {}
   configuration: ~
+  target-configuration: ~

crates/pixi_build_frontend/src/backend/json_rpc.rs

@@ -12,9 +12,12 @@ use jsonrpsee::{
     types::ErrorCode,
 };
 use miette::Diagnostic;
+use ordermap::OrderMap;
 use pixi_build_types::{
-    BackendCapabilities, FrontendCapabilities, ProjectModelV1, VersionedProjectModel, procedures,
+    BackendCapabilities, FrontendCapabilities, ProjectModelV1, TargetSelectorV1,
+    VersionedProjectModel,
     procedures::{
+        self,
         conda_build_v0::{CondaBuildParams, CondaBuildResult},
         conda_build_v1::{CondaBuildV1Params, CondaBuildV1Result},
         conda_metadata::{CondaMetadataParams, CondaMetadataResult},
@@ -143,6 +146,7 @@ impl JsonRpcBackend {
         manifest_path: PathBuf,
         package_manifest: Option<ProjectModelV1>,
         configuration: Option<serde_json::Value>,
+        target_configuration: Option<OrderMap<TargetSelectorV1, serde_json::Value>>,
         cache_dir: Option<PathBuf>,
         tool: Tool,
     ) -> Result<Self, InitializeError> {
@@ -187,6 +191,7 @@ impl JsonRpcBackend {
             manifest_path,
             package_manifest,
             configuration,
+            target_configuration,
             cache_dir,
             tx,
             rx,
@@ -203,6 +208,7 @@ impl JsonRpcBackend {
         manifest_path: PathBuf,
         project_model: Option<ProjectModelV1>,
         configuration: Option<serde_json::Value>,
+        target_configuration: Option<OrderMap<TargetSelectorV1, serde_json::Value>>,
         cache_dir: Option<PathBuf>,
         sender: impl TransportSenderT + Send,
         receiver: impl TransportReceiverT + Send,
@@ -239,6 +245,7 @@ impl JsonRpcBackend {
                 RpcParams::from(InitializeParams {
                     project_model: project_model.map(VersionedProjectModel::V1),
                     configuration,
+                    target_configuration,
                     manifest_path: manifest_path.clone(),
                     source_dir: Some(source_dir),
                     cache_directory: cache_dir,

crates/pixi_build_type_conversions/src/lib.rs

@@ -1,3 +1,3 @@
 mod project_model;
 
-pub use project_model::{compute_project_model_hash, to_project_model_v1};
+pub use project_model::{compute_project_model_hash, to_project_model_v1, to_target_selector_v1};

crates/pixi_build_type_conversions/src/project_model.rs

@@ -136,7 +136,7 @@ fn to_target_v1(
     })
 }
 
-fn to_target_selector_v1(selector: &TargetSelector) -> pbt::TargetSelectorV1 {
+pub fn to_target_selector_v1(selector: &TargetSelector) -> pbt::TargetSelectorV1 {
     match selector {
         TargetSelector::Platform(platform) => pbt::TargetSelectorV1::Platform(platform.to_string()),
         TargetSelector::Unix => pbt::TargetSelectorV1::Unix,

crates/pixi_build_types/src/procedures/initialize.rs

@@ -2,9 +2,10 @@
 
 use std::path::PathBuf;
 
+use ordermap::OrderMap;
 use serde::{Deserialize, Serialize};
 
-use crate::VersionedProjectModel;
+use crate::{TargetSelectorV1, VersionedProjectModel};
 
 pub const METHOD_NAME: &str = "initialize";
 
@@ -46,6 +47,9 @@ pub struct InitializeParams {
 
     /// Backend specific configuration passed from the frontend to the backend.
     pub configuration: Option<serde_json::Value>,
+
+    /// Targets that apply to the backend.
+    pub target_configuration: Option<OrderMap<TargetSelectorV1, serde_json::Value>>,
 }
 
 /// The result of the initialize request.

crates/pixi_command_dispatcher/src/command_dispatcher/instantiate_backend.rs

@@ -62,6 +62,7 @@ impl CommandDispatcher {
                         cache_directory: Some(self.cache_dirs().root().clone()),
                         project_model: spec.init_params.project_model.map(Into::into),
                         configuration: spec.init_params.configuration,
+                        target_configuration: spec.init_params.target_configuration,
                     })
                     .map_err(InstantiateBackendError::InMemoryError)
                     .map_err(CommandDispatcherError::Failed)?;
@@ -141,6 +142,7 @@ impl CommandDispatcher {
             manifest_path,
             spec.init_params.project_model,
             spec.init_params.configuration,
+            spec.init_params.target_configuration,
             Some(self.cache_dirs().root().clone()),
             tool,
         )

crates/pixi_manifest/src/build_system.rs

@@ -4,6 +4,7 @@ use indexmap::IndexMap;
 use pixi_spec::BinarySpec;
 use rattler_conda_types::NamedChannelOrUrl;
 
+use crate::TargetSelector;
 use crate::toml::FromTomlStr;
 use crate::{TomlError, toml::TomlPackageBuild};
 
@@ -23,6 +24,9 @@ pub struct PackageBuild {
 
     /// Additional configuration for the build backend.
     pub configuration: Option<serde_value::Value>,
+
+    /// Target-specific configuration for different platforms
+    pub target_configuration: Option<IndexMap<TargetSelector, serde_value::Value>>,
 }
 
 impl PackageBuild {
@@ -33,6 +37,7 @@ impl PackageBuild {
             channels: Some(channels),
             additional_dependencies: IndexMap::default(),
             configuration: None,
+            target_configuration: None,
         }
     }
 }

crates/pixi_manifest/src/toml/build_system.rs

@@ -1,15 +1,17 @@
 use std::collections::BTreeMap;
 
+use indexmap::IndexMap;
 use itertools::Either;
 use pixi_spec::TomlSpec;
-use pixi_toml::{TomlFromStr, TomlWith};
+use pixi_toml::{Same, TomlFromStr, TomlIndexMap, TomlWith};
 use rattler_conda_types::NamedChannelOrUrl;
 use toml_span::{DeserError, Spanned, Value, de_helpers::TableHelper, value::ValueInner};
 
 use crate::{
-    PackageBuild, TomlError,
+    PackageBuild, TargetSelector, TomlError,
     build_system::BuildBackend,
     error::GenericError,
+    toml::build_target::TomlPackageBuildTarget,
     utils::{PixiSpanned, package_map::UniquePackageMap},
 };
 
@@ -19,6 +21,7 @@ pub struct TomlPackageBuild {
     pub channels: Option<PixiSpanned<Vec<NamedChannelOrUrl>>>,
     pub additional_dependencies: UniquePackageMap,
     pub configuration: Option<serde_value::Value>,
+    pub target: IndexMap<PixiSpanned<TargetSelector>, TomlPackageBuildTarget>,
 }
 
 #[derive(Debug)]
@@ -70,6 +73,17 @@ impl TomlPackageBuild {
             }
         }
 
+        // Convert target-specific build configurations
+        let target_configuration = self
+            .target
+            .into_iter()
+            .flat_map(|(selector, target)| {
+                target
+                    .configuration
+                    .map(|config| (selector.into_inner(), config))
+            })
+            .collect::<IndexMap<_, _>>();
+
         Ok(PackageBuild {
             backend: BuildBackend {
                 name: self.backend.value.name.value,
@@ -78,11 +92,16 @@ impl TomlPackageBuild {
             additional_dependencies,
             channels: self.channels.map(|channels| channels.value),
             configuration: self.configuration,
+            target_configuration: if target_configuration.is_empty() {
+                None
+            } else {
+                Some(target_configuration)
+            },
         })
     }
 }
 
-fn convert_toml_to_serde(value: &mut Value) -> Result<serde_value::Value, DeserError> {
+pub fn convert_toml_to_serde(value: &mut Value) -> Result<serde_value::Value, DeserError> {
     Ok(match value.take() {
         ValueInner::String(s) => serde_value::Value::String(s.to_string()),
         ValueInner::Integer(i) => serde_value::Value::I64(i),
@@ -143,12 +162,18 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackageBuild {
             .map(|(_, mut value)| convert_toml_to_serde(&mut value))
             .transpose()?;
 
+        let target = th
+            .optional::<TomlWith<_, TomlIndexMap<_, Same>>>("target")
+            .map(TomlWith::into_inner)
+            .unwrap_or_default();
+
         th.finalize(None)?;
         Ok(Self {
             backend: build_backend,
             channels,
             additional_dependencies,
             configuration,
+            target,
         })
     }
 }

crates/pixi_manifest/src/toml/build_target.rs

@@ -0,0 +1,21 @@
+use toml_span::{DeserError, Value, de_helpers::TableHelper};
+
+use crate::toml::build_system::convert_toml_to_serde;
+
+#[derive(Debug)]
+pub struct TomlPackageBuildTarget {
+    pub configuration: Option<serde_value::Value>,
+}
+
+impl<'de> toml_span::Deserialize<'de> for TomlPackageBuildTarget {
+    fn deserialize(value: &mut Value<'de>) -> Result<Self, DeserError> {
+        let mut th = TableHelper::new(value)?;
+        let configuration = th
+            .take("configuration")
+            .map(|(_, mut value)| convert_toml_to_serde(&mut value))
+            .transpose()?;
+
+        th.finalize(None)?;
+        Ok(TomlPackageBuildTarget { configuration })
+    }
+}

crates/pixi_manifest/src/toml/mod.rs

@@ -1,4 +1,5 @@
 mod build_system;
+mod build_target;
 mod channel;
 mod document;
 mod environment;

crates/pixi_manifest/src/toml/snapshots/pixi_manifest__toml__build_system__test__additional_keys.snap

@@ -2,7 +2,7 @@
 source: crates/pixi_manifest/src/toml/build_system.rs
 expression: "expect_parse_failure(r#\"\n            backend = { name = \"foobar\", version = \"*\" }\n            additional = \"key\"\n        \"#)"
 ---
-  × Unexpected keys, expected only 'backend', 'channels', 'additional-dependencies', 'configuration'
+  × Unexpected keys, expected only 'backend', 'channels', 'additional-dependencies', 'configuration', 'target'
    ╭─[pixi.toml:3:13]
  2 │             backend = { name = "foobar", version = "*" }
  3 │             additional = "key"

crates/pixi_manifest/src/toml/snapshots/pixi_manifest__toml__build_system__test__configuration_parsing.snap

@@ -84,4 +84,5 @@ TomlPackageBuild {
             },
         ),
     ),
+    target: {},
 }

schema/model.py

@@ -683,6 +683,14 @@ class Package(StrictBaseModel):
     )
 
 
+class BuildTarget(StrictBaseModel):
+    """Target-specific build configuration for different platforms"""
+
+    configuration: dict[str, Any] = Field(
+        None, description="Target-specific configuration for the build backend"
+    )
+
+
 class Build(StrictBaseModel):
     backend: BuildBackend = Field(..., description="The build backend to instantiate")
     channels: list[Channel] = Field(
@@ -694,6 +702,11 @@ class Build(StrictBaseModel):
     configuration: dict[str, Any] = Field(
         None, description="The configuration of the build backend"
     )
+    target: dict[TargetName, BuildTarget] | None = Field(
+        None,
+        description="Target-specific build configuration for different platforms",
+        examples=[{"linux-64": {"configuration": {"key": "value"}}}],
+    )
 
 
 class BuildBackend(MatchspecTable):