From ed829aace05e585c975d8c62dcc27a08e242ce21 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Wed, 17 Jun 2020 13:22:06 +0200 Subject: [PATCH] Clean cpic dependencies --- bsc/cpic/default.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/bsc/cpic/default.nix b/bsc/cpic/default.nix index 284c269..a03e239 100644 --- a/bsc/cpic/default.nix +++ b/bsc/cpic/default.nix @@ -4,14 +4,9 @@ , nanos6 , mpi , uthash -, overrideCC -, llvmPackages_10 , fftw , tampi , hdf5 -, libgcc -, strace -, gcc }: stdenv.mkDerivation rec { @@ -30,13 +25,12 @@ stdenv.mkDerivation rec { env ''; - -# export NANOS6_HOME="${nanos6}" preConfigure = '' export TAMPI_HOME="${tampi}" + #export NIX_DEBUG=5 ''; - #enableParallelBuilding = true; + enableParallelBuilding = true; dontStrip = true; buildInputs = [ @@ -44,23 +38,11 @@ stdenv.mkDerivation rec { nanos6 mpi uthash -# llvmPackages_10.bintools fftw tampi hdf5 - libgcc - strace - gcc ]; -# Doesnt work -# export LIBRARY_PATH=${libgcc}/lib -# export LD_LIBRARY_PATH=${libgcc}/lib -# buildPhase = '' -# #NIX_DEBUG=5 strace -ff -s99999 -e trace=execve make SHELL='bash -x' -# NIX_DEBUG=5 strace -ff -s99999 -e trace=execve make SHELL='bash -x' -# ''; - installPhase = '' mkdir -p $out/bin cp cpic $out/bin/cpic