Clean up paraver derivations
This commit is contained in:
parent
44cc60fcd8
commit
0287ac80b8
@ -1,5 +1,4 @@
|
|||||||
{
|
{ stdenv
|
||||||
stdenv
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, boost
|
, boost
|
||||||
@ -12,14 +11,17 @@
|
|||||||
, openssl
|
, openssl
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
|
|
||||||
|
, enableDebug ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
wx = wxGTK32;
|
wx = wxGTK32;
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "wxparaver";
|
|
||||||
version = "4.12.0";
|
version = "4.12.0";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "wxparaver";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bsc-performance-tools";
|
owner = "bsc-performance-tools";
|
||||||
@ -36,21 +38,26 @@ stdenv.mkDerivation rec {
|
|||||||
./fix-boost-87.patch
|
./fix-boost-87.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
hardeningDisable = [ "all" ];
|
|
||||||
|
|
||||||
# Fix the PARAVER_HOME variable
|
# Fix the PARAVER_HOME variable
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver
|
sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver
|
||||||
sed -i '1aexport LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"' docs/wxparaver
|
sed -i '1aexport LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"' docs/wxparaver
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontStrip = true;
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
preConfigure = ''
|
hardeningDisable = [ "all" ];
|
||||||
export CFLAGS="-O3"
|
|
||||||
export CXXFLAGS="-O3"
|
dontStrip = true;
|
||||||
'';
|
|
||||||
|
env =
|
||||||
|
let
|
||||||
|
flags = if enableDebug then "-ggdb -Og" else "-O3";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
CFLAGS = flags;
|
||||||
|
CXXFLAGS = flags;
|
||||||
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-boost=${boost}"
|
"--with-boost=${boost}"
|
||||||
@ -68,11 +75,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
libxml2.dev
|
libxml2
|
||||||
xml2
|
xml2
|
||||||
wx
|
wx
|
||||||
paraverKernel
|
paraverKernel
|
||||||
openssl.dev
|
openssl
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{
|
{ stdenv
|
||||||
stdenv
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, boost
|
, boost
|
||||||
@ -9,11 +8,16 @@
|
|||||||
, automake
|
, automake
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, zlib
|
, zlib
|
||||||
|
|
||||||
|
, enableDebug ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let
|
||||||
pname = "paraver-kernel";
|
|
||||||
version = "4.12.0";
|
version = "4.12.0";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "paraver-kernel";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bsc-performance-tools";
|
owner = "bsc-performance-tools";
|
||||||
@ -34,10 +38,14 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
||||||
preConfigure = ''
|
env =
|
||||||
export CFLAGS="-O3 -DPARALLEL_ENABLED"
|
let
|
||||||
export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
|
flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
|
||||||
'';
|
in
|
||||||
|
{
|
||||||
|
CFLAGS = flags;
|
||||||
|
CXXFLAGS = flags;
|
||||||
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-boost=${boost}"
|
"--with-boost=${boost}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user