Fix strictDeps ovni

overlay.nix

@@ -1,19 +1,15 @@
 final: /* Future last stage */
 prev:  /* Previous stage */
 
-let
-  inherit (final.lib) collect isDerivation mapAttrs;
+with final.lib;
 
-  inherit (final) callPackage;
+let
+  callPackage = final.callPackage;
 
   mkDeps = name: pkgs: final.runCommand name { }
     "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
 
-  mkStrict = drv: if (isDerivation drv && drv ? overrideAttrs)
-    then drv.overrideAttrs { strictDeps = true; }
-    else drv;
-
-  bscPkgs = mapAttrs (_: mkStrict) {
+  _bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
     clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
@@ -53,6 +49,9 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
+  mkStrict = drv: if (isDerivation drv && drv ? overrideAttrs) then drv.overrideAttrs { strictDeps = true; } else drv;
+  bscPkgs = mapAttrs (_: mkStrict) _bscPkgs;
+
 in bscPkgs // {
   # Prevent accidental usage of bsc attribute
   bsc = throw "the bsc attribute is deprecated, packages are now in the root";