diff options
| author | Atkins <atkins@fstk.io> | 2019-07-26 00:48:18 +0800 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-07-30 12:26:27 +0100 |
| commit | 626ccd7121adad49e605f310cb5e557fc5265c57 (patch) | |
| tree | 426c3e8635ca5a257287b236a47399c12ed6bae3 /pkgs/build-support | |
| parent | b53e237ef679ee8f4dd366750ef01f5ac83de80a (diff) | |
| download | nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.tar nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.tar.gz nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.tar.bz2 nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.tar.lz nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.tar.xz nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.tar.zst nixlib-626ccd7121adad49e605f310cb5e557fc5265c57.zip | |
buildRustPackage: Avoid altering `.cargo/config` in source
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 762a61b8a579..94873c32a4e6 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 ''; |