diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-09-29 01:15:06 -0400 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:29:15 +0000 |
commit | 454813293521972c721b0e476f85ff2f2e9500ec (patch) | |
tree | 3f6a8b45cf37d710d0650128c77550a99fe63c78 /nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix | |
parent | 51da610320fbb39fa9fca2ce9f2079ee1cccf76b (diff) | |
download | nixlib-454813293521972c721b0e476f85ff2f2e9500ec.tar nixlib-454813293521972c721b0e476f85ff2f2e9500ec.tar.gz nixlib-454813293521972c721b0e476f85ff2f2e9500ec.tar.bz2 nixlib-454813293521972c721b0e476f85ff2f2e9500ec.tar.lz nixlib-454813293521972c721b0e476f85ff2f2e9500ec.tar.xz nixlib-454813293521972c721b0e476f85ff2f2e9500ec.tar.zst nixlib-454813293521972c721b0e476f85ff2f2e9500ec.zip |
buildRustCrate: fix target config environment variables on 32-bit ARM
(cherry picked from commit f0fdecfbb45c74bfb6f46017563e7ec941b604e9)
Diffstat (limited to 'nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix')
-rw-r--r-- | nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index d559aba16165..1d8cd555523b 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -7,12 +7,6 @@ { lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust, cargo, jq }: let - # This doesn't appear to be officially documented anywhere yet. - # See https://github.com/rust-lang-nursery/rust-forge/issues/101. - target_os = if stdenv.hostPlatform.isDarwin - then "macos" - else stdenv.hostPlatform.parsed.kernel.name; - # Create rustc arguments to link against the given list of dependencies # and renames. # @@ -51,7 +45,7 @@ let inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; + inherit lib stdenv rust echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; buildCrate = import ./build-crate.nix { @@ -279,7 +273,7 @@ stdenv.mkDerivation (rec { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures crateRenames libName build workspace_member release libPath crateVersion extraLinkFlags extraRustcOpts - crateAuthors crateHomepage verbose colors target_os; + crateAuthors crateHomepage verbose colors; }; buildPhase = buildCrate { inherit crateName dependencies |