Merge all branches

flake.nix

@@ -31,9 +31,5 @@
             (flip removeAttrs [ "bsc" ])
             (filterAttrs (_: isDerivation))
           ];
-       legacyPackages.x86_64-linux = pkgs;
-
-      # propagate nixpkgs lib, so we can do bscpkgs.lib
-      inherit (nixpkgs) lib;
     };
 }

pkgs/paraver/default.nix

@@ -1,28 +1,25 @@
 {
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  boost,
-  libxml2,
-  xml2,
-  wxGTK32,
-  autoconf,
-  automake,
-  paraverKernel,
-  openssl,
-  glibcLocales,
-  wrapGAppsHook,
-
-  enableDebug ? false,
+  stdenv
+, fetchFromGitHub
+, autoreconfHook
+, boost
+, libxml2
+, xml2
+, wxGTK32
+, autoconf
+, automake
+, paraverKernel
+, openssl
+, glibcLocales
+, wrapGAppsHook
 }:
 
 let
   wx = wxGTK32;
-  version = "4.12.0";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "wxparaver";
-  inherit version;
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -39,26 +36,21 @@ stdenv.mkDerivation {
     ./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;
 
-  hardeningDisable = [ "all" ];
-
-  dontStrip = true;
-
-  env =
-    let
-      flags = if enableDebug then "-ggdb -Og" else "-O3";
-    in
-    {
-      CFLAGS = flags;
-      CXXFLAGS = flags;
-    };
+  preConfigure = ''
+    export CFLAGS="-O3"
+    export CXXFLAGS="-O3"
+  '';
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -76,11 +68,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    libxml2
+    libxml2.dev
     xml2
     wx
     paraverKernel
-    openssl
+    openssl.dev
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

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