mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
clean up usage of procps in rustc
This commit is contained in:
parent
7336191574
commit
beea8537f7
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue