public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust: Don't force gcc6

Browse Source
This commit is contained in:
Michael Eden 2019-03-11 21:19:48 -04:00 committed by John Ericson
parent f93470d7a3
commit 54e9082375
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/rust/default.nix
View File

@ -2,7 +2,6 @@
, buildPackages , buildPackages
, newScope, callPackage , newScope, callPackage
, CoreFoundation, Security , CoreFoundation, Security
, gcc6
}: rec { }: rec {
makeRustPlatform = { rustc, cargo, ... }: { makeRustPlatform = { rustc, cargo, ... }: {
rust = { rust = {
@ -49,19 +48,15 @@
buildRustPackages = buildPackages.rust.packages.stable; buildRustPackages = buildPackages.rust.packages.stable;
# Analogous to stdenv # Analogous to stdenv
rustPlatform = makeRustPlatform self.buildRustPackages; rustPlatform = makeRustPlatform self.buildRustPackages;
rustc = self.callPackage ./rustc.nix ({ rustc = self.callPackage ./rustc.nix {
# Use boot package set to break cycle # Use boot package set to break cycle
rustPlatform = bootRustPlatform; 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 # Use boot package set to break cycle
rustPlatform = bootRustPlatform; rustPlatform = bootRustPlatform;
inherit CoreFoundation Security; inherit CoreFoundation Security;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { };
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
}); });
}; };
} }