From 6537f876c0ec13fe9545047501f9990b0dea4583 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 9 Sep 2024 16:50:45 +0200 Subject: [PATCH 1/2] default-crate-overrides: proc-macro-crate: don't break potential patches (cherry picked from commit b72d5e3341545483dfeb7a47d793820925b14bb0) --- pkgs/build-support/rust/default-crate-overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 2d19f8828533..7903bc2dff0c 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -348,7 +348,7 @@ # Assumes it can run Command::new(env::var("CARGO")).arg("locate-project") # https://github.com/bkchr/proc-macro-crate/blame/master/src/lib.rs#L244 proc-macro-crate = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "2.0") { - prePatch = (attrs.prePatch or "") + '' + postPatch = (attrs.postPatch or "") + '' substituteInPlace \ src/lib.rs \ --replace-fail \ From ef6e4ee7e57ac01ed509eb4ac3385683af716f81 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 11 Mar 2025 00:07:56 +0100 Subject: [PATCH 2/2] default-crate-overrides: proc-macro-crate: fix build for 3.3.0 https://github.com/bkchr/proc-macro-crate/commit/db99213ae08c7f6cd1dadda60c3b42d16f2c0099 --- pkgs/build-support/rust/default-crate-overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 7903bc2dff0c..232de41b9031 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -346,14 +346,14 @@ }; # Assumes it can run Command::new(env::var("CARGO")).arg("locate-project") - # https://github.com/bkchr/proc-macro-crate/blame/master/src/lib.rs#L244 + # https://github.com/bkchr/proc-macro-crate/blame/master/src/lib.rs#L242 proc-macro-crate = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "2.0") { postPatch = (attrs.postPatch or "") + '' substituteInPlace \ src/lib.rs \ --replace-fail \ - 'env::var("CARGO").map_err(|_| Error::CargoEnvVariableNotSet)?' \ - '"${lib.getBin buildPackages.cargo}/bin/cargo"' + 'env::var("CARGO")' \ + 'Ok::<_, core::convert::Infallible>("${lib.getBin buildPackages.cargo}/bin/cargo")' ''; }; }