Skip to content

Commit bbbbdc6

Browse files
committed
fix: ignore build-override in profile due to crate collision errors
1 parent cd4ce3b commit bbbbdc6

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

crate2nix/templates/nix/crate2nix/default.nix

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,6 @@ rec {
374374
panic = "unwind"; # tests require panic=unwind
375375
});
376376
depProfileRustcOpts = profileToRustcOpts profileCfg true;
377-
buildProfileRustcOpts = profileToRustcOpts
378-
(profileCfg // (profileCfg.build-override or {})) true;
379377
devDependencies = lib.optionals (runTests && packageId == rootPackageId) (
380378
crateConfig'.devDependencies or [ ]
381379
);
@@ -391,16 +389,16 @@ rec {
391389
self.crates.${depPackageId}
392390
).override {
393391
extraRustcOpts = depProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
394-
extraRustcOptsForBuildRs = buildProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
392+
extraRustcOptsForBuildRs = depProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
395393
};
396394
dependencies = (crateConfig.dependencies or [ ]) ++ devDependencies;
397395
};
398396
buildDependencies = dependencyDerivations {
399397
inherit features;
400398
inherit (self.build) target;
401399
buildByPackageId = depPackageId: self.build.crates.${depPackageId}.override {
402-
extraRustcOpts = buildProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
403-
extraRustcOptsForBuildRs = buildProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
400+
extraRustcOpts = depProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
401+
extraRustcOptsForBuildRs = depProfileRustcOpts ++ targetFeaturesRustcOpts ++ globalRustcOpts;
404402
};
405403
dependencies = crateConfig.buildDependencies or [ ];
406404
};
@@ -470,7 +468,7 @@ rec {
470468
// (lib.optionalAttrs (packageId == rootPackageId) {
471469
extraRustcOpts = (profileToRustcOpts profileCfg false) ++ targetFeaturesRustcOpts ++ globalRustcOpts;
472470
extraRustcOptsForBuildRs =
473-
(profileToRustcOpts (profileCfg // (profileCfg.build-override or {})) false)
471+
(profileToRustcOpts profileCfg false)
474472
++ targetFeaturesRustcOpts ++ globalRustcOpts;
475473
})
476474
);
@@ -873,11 +871,6 @@ rec {
873871
# split-debuginfo = "...";
874872
strip = "none";
875873
panic = "unwind";
876-
build-override = {
877-
opt-level = 0;
878-
codegen-units = 256;
879-
debug = false;
880-
};
881874
};
882875
release = {
883876
overflow-checks = false;
@@ -891,10 +884,6 @@ rec {
891884
panic = "unwind";
892885
codegen-units = 16;
893886
debug-assertions = false;
894-
build-override = {
895-
opt-level = 0;
896-
codegen-units = 256;
897-
};
898887
};
899888
};
900889

0 commit comments

Comments
 (0)