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

clean up usage of procps in rustc

Browse Source
This commit is contained in:
Jude Taylor 2016-02-23 12:59:36 -08:00
parent 7336191574
commit beea8537f7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/rustc/generic.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
, llvmPackages_37, jemalloc, ncurses , llvmPackages_37, jemalloc, ncurses, darwin
, shortVersion, isRelease , shortVersion, isRelease
, forceBundledLLVM ? false , forceBundledLLVM ? false
@ -10,7 +10,7 @@
, configureFlags ? [] , configureFlags ? []
, patches , patches
}: } @ args:
assert !stdenv.isFreeBSD; assert !stdenv.isFreeBSD;
@ -37,6 +37,8 @@ let version = if isRelease then
name = "rustc-${version}"; name = "rustc-${version}";
procps = if stdenv.isDarwin then darwin.ps else args.procps;
llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; }; llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; };
platform = if stdenv.system == "i686-linux" platform = if stdenv.system == "i686-linux"

6
pkgs/top-level/all-packages.nix
View File

@ -5062,11 +5062,7 @@ let
rtags = callPackage ../development/tools/rtags/default.nix {}; rtags = callPackage ../development/tools/rtags/default.nix {};
rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
rustc = callPackage ../development/compilers/rustc { rustc = callPackage ../development/compilers/rustc {};
callPackage = newScope ({
procps = if stdenv.isDarwin then darwin.ps else procps;
});
};
rustPlatform = rustStable; rustPlatform = rustStable;