Fix strictDeps ovni

overlay.nix

@@ -9,7 +9,7 @@ let
   mkDeps = name: pkgs: final.runCommand name { }
     "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
 
-  bscPkgs = {
+  _bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
     clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
@@ -49,10 +49,8 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
-  allPkgs = collect isDerivation bscPkgs;
-
-  mkStrict = pkg: if pkg ? overrideAttrs then pkg.overrideAttrs { strictDeps = true; } else pkg;
-  strictPkgs = map mkStrict allPkgs;
+  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
@@ -94,7 +92,7 @@ in bscPkgs // {
     };
 
     pkgs = final.runCommand "ci-pkgs" { }
-      "printf '%s\n' ${toString strictPkgs} > $out";
+      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
 
     tests = final.runCommand "ci-tests" { }
       "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";