diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-29 13:51:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-29 13:51:10 +0100 |
| commit | 0d8491cb2b045e8a0b52bde121929b15a1d20196 (patch) | |
| tree | d3740bc4c45a54ff299cb9a9bb0bc7cb8fa1e02d /pkgs/build-support/rust/build-rust-crate/configure-crate.nix | |
| parent | 9e062723b2d60d2be85268fb7eebb28abce0b5af (diff) | |
| parent | 3a477cf32417b4c81c9fe42fbfb52c40b69fc110 (diff) | |
| download | nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.tar nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.tar.gz nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.tar.bz2 nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.tar.lz nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.tar.xz nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.tar.zst nixpkgs-0d8491cb2b045e8a0b52bde121929b15a1d20196.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/rust/build-rust-crate/configure-crate.nix')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 18587f7047c..5ada40b3b9b 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -135,8 +135,8 @@ in '' export CARGO_MANIFEST_DIR=$(pwd) export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" - export TARGET="${rust.toRustTarget stdenv.hostPlatform}" - export HOST="${rust.toRustTarget stdenv.buildPlatform}" + export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" + export HOST="${rust.toRustTargetSpec stdenv.buildPlatform}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} |