Clean up paraver derivations

pkgs/paraver/default.nix

@@ -1,5 +1,4 @@
-{
-  stdenv
+{ stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -12,14 +11,17 @@
 , 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 +38,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}"
@@ -60,19 +67,19 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    autoconf
+    automake
+    autoreconfHook
     wrapGAppsHook
   ];
 
   buildInputs = [
-    autoreconfHook
     boost
-    libxml2.dev
+    libxml2
     xml2
     wx
-    autoconf
-    automake
     paraverKernel
-    openssl.dev
+    openssl
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -1,5 +1,4 @@
-{
-  stdenv
+{ stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -9,11 +8,16 @@
 , 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,24 +38,31 @@ 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}"
     "--enable-openmp"
   ];
 
-  buildInputs = [
+  nativeBuildInputs = [
     autoreconfHook
-    boost
-    libxml2.dev
-    xml2
     autoconf
     automake
     pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    libxml2.dev
+    xml2
     zlib
   ];
 }

pkgs/paraver/release.nix

@@ -61,13 +61,16 @@ stdenv.mkDerivation rec {
     "--with-wx-config=${wx}/bin/wx-config"
   ];
 
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
   buildInputs = [
     boost
     xml2
     libxml2.dev
     wx
-    autoconf
-    automake
     openssl.dev
   ];