diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-26 18:42:46 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 18:17:37 -0500 |
| commit | ef428ab202322b93930c3db0d66573c16f692c5f (patch) | |
| tree | c340599d258ab4a0054556f473413681bbca9691 /pkgs/development/compilers | |
| parent | ce8ce600ae41d3899e4a556fa9ff8a1a34374063 (diff) | |
| download | nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.gz nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.bz2 nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.lz nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.xz nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.tar.zst nixlib-ef428ab202322b93930c3db0d66573c16f692c5f.zip | |
treewide: cleanup procps uses
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/go/1.10.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978d..1be94ba5c6ca 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c4..47c1d1fdc951 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; 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 |