diff --git a/crate2nix/Cargo.nix b/crate2nix/Cargo.nix index c0a51a5e..39ce57a8 100644 --- a/crate2nix/Cargo.nix +++ b/crate2nix/Cargo.nix @@ -3690,7 +3690,9 @@ rec { buildByPackageIdImpl = packageId: let features = mergedFeatures."${packageId}" or []; - crateConfig' = crateConfigs."${packageId}"; + unoverriddenCrateConfig = crateConfigs."${packageId}"; + crateOverride = crateOverrides.${unoverriddenCrateConfig.crateName} or (lib.const {}); + crateConfig' = unoverriddenCrateConfig // (crateOverride unoverriddenCrateConfig); crateConfig = builtins.removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ]; devDependencies = diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix index be5b77df..788c67e3 100644 --- a/crate2nix/templates/nix/crate2nix/default.nix +++ b/crate2nix/templates/nix/crate2nix/default.nix @@ -175,7 +175,9 @@ rec { buildByPackageIdImpl = packageId: let features = mergedFeatures."${packageId}" or []; - crateConfig' = crateConfigs."${packageId}"; + unoverriddenCrateConfig = crateConfigs."${packageId}"; + crateOverride = crateOverrides.${unoverriddenCrateConfig.crateName} or (lib.const {}); + crateConfig' = unoverriddenCrateConfig // (crateOverride unoverriddenCrateConfig); crateConfig = builtins.removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ]; devDependencies = diff --git a/sample_projects/bin_with_git_branch_dep/Cargo.nix b/sample_projects/bin_with_git_branch_dep/Cargo.nix index c94d62d2..e84f881d 100644 --- a/sample_projects/bin_with_git_branch_dep/Cargo.nix +++ b/sample_projects/bin_with_git_branch_dep/Cargo.nix @@ -285,7 +285,9 @@ rec { buildByPackageIdImpl = packageId: let features = mergedFeatures."${packageId}" or []; - crateConfig' = crateConfigs."${packageId}"; + unoverriddenCrateConfig = crateConfigs."${packageId}"; + crateOverride = crateOverrides.${unoverriddenCrateConfig.crateName} or (lib.const {}); + crateConfig' = unoverriddenCrateConfig // (crateOverride unoverriddenCrateConfig); crateConfig = builtins.removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ]; devDependencies = diff --git a/sample_projects/bin_with_git_submodule_dep/Cargo.nix b/sample_projects/bin_with_git_submodule_dep/Cargo.nix index 8eb957db..36c705ee 100644 --- a/sample_projects/bin_with_git_submodule_dep/Cargo.nix +++ b/sample_projects/bin_with_git_submodule_dep/Cargo.nix @@ -1532,7 +1532,9 @@ rec { buildByPackageIdImpl = packageId: let features = mergedFeatures."${packageId}" or []; - crateConfig' = crateConfigs."${packageId}"; + unoverriddenCrateConfig = crateConfigs."${packageId}"; + crateOverride = crateOverrides.${unoverriddenCrateConfig.crateName} or (lib.const {}); + crateConfig' = unoverriddenCrateConfig // (crateOverride unoverriddenCrateConfig); crateConfig = builtins.removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ]; devDependencies =