diff options
| author | Jude Taylor <me@jude.bio> | 2016-02-23 12:59:36 -0800 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2016-02-23 16:42:51 -0800 |
| commit | beea8537f7ebac9805cf526538f51e170353647e (patch) | |
| tree | 410155085978a3e89a42f938146a0d2b8dad20ee /pkgs/development/compilers | |
| parent | 733619157483860d4f970559616fe30171c37022 (diff) | |
| download | nixlib-beea8537f7ebac9805cf526538f51e170353647e.tar nixlib-beea8537f7ebac9805cf526538f51e170353647e.tar.gz nixlib-beea8537f7ebac9805cf526538f51e170353647e.tar.bz2 nixlib-beea8537f7ebac9805cf526538f51e170353647e.tar.lz nixlib-beea8537f7ebac9805cf526538f51e170353647e.tar.xz nixlib-beea8537f7ebac9805cf526538f51e170353647e.tar.zst nixlib-beea8537f7ebac9805cf526538f51e170353647e.zip | |
clean up usage of procps in rustc
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rustc/generic.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index d578facad698..8be2ec05f07e 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" |