From 626ccd7121adad49e605f310cb5e557fc5265c57 Mon Sep 17 00:00:00 2001 From: Atkins Date: Fri, 26 Jul 2019 00:48:18 +0800 Subject: [PATCH] buildRustPackage: Avoid altering `.cargo/config` in source --- pkgs/build-support/rust/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 762a61b8a57..94873c32a4e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -72,14 +72,6 @@ in stdenv.mkDerivation (args // { substitute $config .cargo/config \ --subst-var-by vendor "$(pwd)/$cargoDepsCopy" - unset cargoDepsCopy - - export RUST_LOG=${logLevel} - '' + (args.postUnpack or ""); - - configurePhase = args.configurePhase or '' - runHook preConfigure - mkdir -p .cargo cat >> .cargo/config <<'EOF' [target."${stdenv.buildPlatform.config}"] "linker" = "${ccForBuild}" @@ -89,6 +81,13 @@ in stdenv.mkDerivation (args // { ''} EOF cat .cargo/config + + unset cargoDepsCopy + export RUST_LOG=${logLevel} + '' + (args.postUnpack or ""); + + configurePhase = args.configurePhase or '' + runHook preConfigure runHook postConfigure '';