Fix infinite recursion evaluating lib

overlay.nix

@@ -1,12 +1,18 @@
 final: /* Future last stage */
 prev:  /* Previous stage */
 
-with final.lib;
-
 let
+
+  inherit (prev) lib;
+  inherit (lib) collect filterAttrs isDerivation mapAttrs;
+
   callPackage = final.callPackage;
 
-  bscPkgs = {
+  mkStrict = drv: if (isDerivation drv && drv ? overrideAttrs && !(drv ? strictDeps))
+    then drv.overrideAttrs { strictDeps = true; }
+    else drv;
+
+  bscPkgs = mapAttrs (_: mkStrict) {
     amd-uprof = prev.callPackage ./pkgs/amd-uprof/default.nix { };
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };

pkgs/paraver/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{
+  stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -11,17 +12,14 @@
 , openssl
 , glibcLocales
 , wrapGAppsHook
-
-, enableDebug ? false
 }:
 
 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";
@@ -38,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}"
@@ -75,11 +68,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    libxml2
+    libxml2.dev
     xml2
     wx
     paraverKernel
-    openssl
+    openssl.dev
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{
+  stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -8,16 +9,11 @@
 , automake
 , pkg-config
 , zlib
-
-, enableDebug ? false
 }:
 
-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";
@@ -38,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}"