Disable extrae as is broken

This commit is contained in:
Rodrigo Arias 2023-04-11 20:32:49 +02:00
parent a46a2ee794
commit 03c7256767
4 changed files with 7 additions and 11 deletions

View File

@ -12,11 +12,12 @@
, gfortran , gfortran
, xml2 , xml2
, which , which
, libbfd
, mpi ? null , mpi ? null
, cuda ? null , cuda ? null
, llvmPackages , llvmPackages
, autoreconfHook , autoreconfHook
, python37Packages #, python3Packages
, installShellFiles , installShellFiles
, symlinkJoin , symlinkJoin
}: }:
@ -64,7 +65,8 @@ stdenv.mkDerivation rec {
xml2 xml2
which which
libxml2.dev libxml2.dev
#python37Packages.sphinx libbfd
#python3Packages.sphinx
] ]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp; ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

View File

@ -10,9 +10,7 @@
, numactl , numactl
, hwloc , hwloc
, papi , papi
, extrae
, boost , boost
, babeltrace2
, ovni , ovni
, enableJemalloc ? true , enableJemalloc ? true
, jemalloc ? null , jemalloc ? null
@ -48,7 +46,6 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--with-babeltrace2=${babeltrace2}"
"--with-ovni=${ovni}" "--with-ovni=${ovni}"
] ++ ] ++
(optional enableJemalloc "--with-jemalloc=${jemalloc}") ++ (optional enableJemalloc "--with-jemalloc=${jemalloc}") ++
@ -71,8 +68,7 @@ stdenv.mkDerivation rec {
numactl numactl
hwloc hwloc
papi papi
babeltrace2
ovni ovni
] ++ (if (extrae != null) then [extrae] else []); ];
} }

View File

@ -9,7 +9,6 @@
, numactl , numactl
, hwloc , hwloc
, papi , papi
, extrae
, boost , boost
, autoreconfHook , autoreconfHook
, enableJemalloc ? true , enableJemalloc ? true
@ -61,6 +60,5 @@ stdenv.mkDerivation rec {
boost boost
numactl numactl
hwloc hwloc
papi ] papi ];
++ (if (extrae != null) then [extrae] else []);
} }

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
tampi tampi
# Tools # Tools
ovni ovni
extrae # extrae # Broken
wxparaver wxparaver
# Runtimes # Runtimes
nanos6 nanos6