diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index d578facad69..8be2ec05f07 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps -, llvmPackages_37, jemalloc, ncurses +, llvmPackages_37, jemalloc, ncurses, darwin , shortVersion, isRelease , forceBundledLLVM ? false @@ -10,7 +10,7 @@ , configureFlags ? [] , patches -}: +} @ args: assert !stdenv.isFreeBSD; @@ -37,6 +37,8 @@ let version = if isRelease then name = "rustc-${version}"; + procps = if stdenv.isDarwin then darwin.ps else args.procps; + llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; }; platform = if stdenv.system == "i686-linux" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 471c83538b3..a05cf918ffa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5062,11 +5062,7 @@ let rtags = callPackage ../development/tools/rtags/default.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = callPackage ../development/compilers/rustc { - callPackage = newScope ({ - procps = if stdenv.isDarwin then darwin.ps else procps; - }); - }; + rustc = callPackage ../development/compilers/rustc {}; rustPlatform = rustStable;