More fixes

Author: bladyjoker

extras/haskell.nix/plutus.nix

@@ -40,7 +40,7 @@ let
     # FIXME: contentAddressed = true;
     reinstallableLibGhc = false; # See https://github.com/input-output-hk/haskell.nix/issues/1939
     packages = {
-      cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 ] ];
+      cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 pkgs.libblst ] ];
       cardano-crypto-praos.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ];
     };
   };

extras/pre-commit-hooks-extra.nix

@@ -2,10 +2,10 @@
   imports = [
     inputs.pre-commit-hooks.flakeModule # Adds perSystem.pre-commit options
   ];
-  perSystem = { pkgs, ... }:
+  perSystem = { pkgsForRust, ... }:
     let
-      inherit (pkgs.rust-bin.stable.latest) rustfmt;
-      inherit (pkgs) deno;
+      inherit (pkgsForRust.rust-bin.stable.latest) rustfmt;
+      inherit (pkgsForRust) deno;
     in
     {
       pre-commit.settings.hooks = {

pkgs.nix

@@ -6,12 +6,6 @@
     _module.args = {
       pkgs = import inputs.nixpkgs {
         inherit system;
-        inherit (inputs.haskell-nix) config;
-        overlays = [
-          inputs.haskell-nix.overlay
-          inputs.iohk-nix.overlays.crypto
-          (import inputs.rust-overlay)
-        ];
       };
 
       # TODO(bladyjoker): If we use recent nixpkgs we get: `error: nodejs_14 has been removed as it is EOL`. That's why we use CTL's old nixpkgs.
@@ -21,6 +15,7 @@
         overlays = [
           inputs.haskell-nix.overlay
           inputs.iohk-nix.overlays.crypto
+          inputs.iohk-nix.overlays.haskell-nix-crypto
           inputs.ctl.overlays.purescript
           inputs.ctl.overlays.spago
         ];
@@ -33,6 +28,7 @@
         overlays = [
           inputs.haskell-nix.overlay
           inputs.iohk-nix.overlays.crypto
+          inputs.iohk-nix.overlays.haskell-nix-crypto
         ];
       };