Clean up paraver derivations

pkgs/paraver/default.nix

@@ -1,25 +1,28 @@
 {
-  stdenv
-, fetchFromGitHub
-, autoreconfHook
-, boost
-, libxml2
-, xml2
-, wxGTK32
-, autoconf
-, automake
-, paraverKernel
-, openssl
-, glibcLocales
-, wrapGAppsHook
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  boost,
+  libxml2,
+  xml2,
+  wxGTK32,
+  autoconf,
+  automake,
+  paraverKernel,
+  openssl,
+  glibcLocales,
+  wrapGAppsHook,
+
+  enableDebug ? false,
 }:
 
 let
   wx = wxGTK32;
-in
-stdenv.mkDerivation rec {
-  pname = "wxparaver";
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "wxparaver";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -36,21 +39,26 @@ stdenv.mkDerivation rec {
     ./fix-boost-87.patch
   ];
 
-  hardeningDisable = [ "all" ];
-
   # Fix the PARAVER_HOME variable
   postPatch = ''
     sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver
     sed -i '1aexport LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"' docs/wxparaver
   '';
 
-  dontStrip = true;
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    export CFLAGS="-O3"
-    export CXXFLAGS="-O3"
-  '';
+  hardeningDisable = [ "all" ];
+
+  dontStrip = true;
+
+  env =
+    let
+      flags = if enableDebug then "-ggdb -Og" else "-O3";
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -68,11 +76,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     boost
-    libxml2.dev
+    libxml2
     xml2
     wx
     paraverKernel
-    openssl.dev
+    openssl
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -1,19 +1,24 @@
 {
-  stdenv
-, fetchFromGitHub
-, autoreconfHook
-, boost
-, libxml2
-, xml2
-, autoconf
-, automake
-, pkg-config
-, zlib
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  boost,
+  libxml2,
+  xml2,
+  autoconf,
+  automake,
+  pkg-config,
+  zlib,
+
+  enableDebug ? false,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "paraver-kernel";
+let
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "paraver-kernel";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -34,10 +39,14 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  preConfigure = ''
-    export CFLAGS="-O3 -DPARALLEL_ENABLED"
-    export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
-  '';
+  env =
+    let
+      flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"