Merge pull request #37840 from matthewbauer/unixtools

Cross-platform "unixtools"
This commit is contained in:
Matthew Justin Bauer
2018-03-27 18:43:03 -05:00
committed by GitHub
236 changed files with 2618 additions and 966 deletions

View File

@@ -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