From a4619673b50bb424371b3fbfa52b202db767313d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 11 Oct 2014 22:04:03 +0200 Subject: [PATCH] clang/llvm: Fewer build-time dependencies Such as valgrind, dejagnu, tcl/tk, ... --- pkgs/development/compilers/llvm/3.4/llvm.nix | 4 ++-- pkgs/development/libraries/libffi/default.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index d9dd1a976b3..d3beb2e7461 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -29,8 +29,8 @@ in stdenv.mkDerivation rec { buildInputs = [ perl groff cmake libxml2 libffi ] - ++ stdenv.lib.optional (!stdenv.isDarwin) python - ++ stdenv.lib.optional stdenv.isLinux valgrind; + ++ stdenv.lib.optional (!stdenv.isDarwin) python /* + ++ stdenv.lib.optional stdenv.isLinux valgrind */; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 20b697144a0..d661bbfc7a2 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { "--with-gcc-arch=generic" # no detection of -march= or -mtune= ] ++ stdenv.lib.optional (stdenv.needsPax) "--enable-pax_emutramp"; - doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD + #doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD + doCheck = false; dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.