diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-27 18:43:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 18:43:03 -0500 |
| commit | 75616ceb49d4e51a3c8efbebc17c09553707fb2c (patch) | |
| tree | 23c9dfd0b70ce4449be8ebef66919e6239a90f2b /pkgs/development/compilers/rust | |
| parent | 9c4745fe73d986e894732501a5de078b3d2bbc30 (diff) | |
| parent | 49455d7bae2f81c5c984faa6728c9017123fa798 (diff) | |
| download | nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.gz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.bz2 nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.lz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.xz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.zst nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.zip | |
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 92b149865fa2..f678286eadea 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,5 @@ { stdenv, targetPackages -, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps +, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps , llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version @@ -19,8 +19,6 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - procps = if stdenv.isDarwin then darwin.ps else args.procps; - llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); @@ -127,7 +125,7 @@ stdenv.mkDerivation { # ps is needed for one of the test cases nativeBuildInputs = - [ file python2 procps rustPlatform.rust.rustc git cmake + [ file python2 ps rustPlatform.rust.rustc git cmake which libffi ] # Only needed for the debuginfo tests |