diff options
author | Michael Eden <themichaeleden@gmail.com> | 2019-03-11 21:19:48 -0400 |
---|---|---|
committer | John Ericson <git@JohnEricson.me> | 2019-03-29 11:11:53 -0400 |
commit | 54e908237550b95080d262143c121f064dbd6ff0 (patch) | |
tree | f58e7a18d6a73e34abf723d72b20d123e74179c7 /pkgs/development/compilers/rust | |
parent | f93470d7a318d91740120e45f8cc6455bc7c56ef (diff) |
rust: Don't force gcc6
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3a6ce5821d91f..47df7e716dc11 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -2,7 +2,6 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, gcc6 }: rec { makeRustPlatform = { rustc, cargo, ... }: { rust = { @@ -49,19 +48,15 @@ buildRustPackages = buildPackages.rust.packages.stable; # Analogous to stdenv rustPlatform = makeRustPlatform self.buildRustPackages; - rustc = self.callPackage ./rustc.nix ({ + rustc = self.callPackage ./rustc.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - cargo = self.callPackage ./cargo.nix ({ + }; + cargo = self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; inherit CoreFoundation Security; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; }); }; } |