Merge pull request #145 from mlabs-haskell/bladyjoker/rust-flake-improvements

Enables devShellHook and devShellTools in rustFlake and removes system

Author: bladyjoker

extras/flake-rust.nix

@@ -1,11 +1,11 @@
 pkgs:
 
-{ crane, src, system, crateName, extraSources ? [ ], extraSourcesDir ? ".extras", data ? [ ], dataDir ? "data" }:
+{ crane, src, crateName, extraSources ? [ ], extraSourcesDir ? ".extras", data ? [ ], dataDir ? "data", devShellHook ? "", devShellTools ? [ ] }:
 let
   rustWithTools = pkgs.rust-bin.stable.latest.default.override {
     extensions = [ "rustfmt" "rust-analyzer" "clippy" ];
   };
-  craneLib = crane.lib.${system}.overrideToolchain rustWithTools;
+  craneLib = crane.lib.${pkgs.system}.overrideToolchain rustWithTools;
 
   # Library source code with extra dependencies attached
   fullSrc = pkgs.stdenv.mkDerivation {
@@ -16,7 +16,7 @@ let
       cp -r $src/* $out
       cd $out
       ${copyExtraSources}
-      ${copyData} 
+      ${copyData}
     '';
   };
   commonArgs = {
@@ -54,9 +54,11 @@ let
 in
 {
   devShells."dev-${crateName}-rust" = craneLib.devShell {
+    packages = devShellTools;
     shellHook = ''
       ${linkExtraSources}
       ${linkData}
+      ${devShellHook}
     '';
   };
 

runtimes/rust/lbr-prelude-derive/build.nix

@@ -1,9 +1,8 @@
 { inputs, ... }: {
-  perSystem = { system, config, ... }:
+  perSystem = { config, ... }:
     let
       rustFlake =
         config.lbf-nix.rustFlake {
-          inherit system;
           src = ./.;
           crane = inputs.crane;
           crateName = "lbr-prelude-derive";
@@ -13,6 +12,7 @@
               path = ../lbr-prelude;
             }
           ];
+          devShellHook = config.settings.shell.hook;
         };
     in
     {

runtimes/rust/lbr-prelude/build.nix

@@ -1,9 +1,8 @@
 { inputs, ... }: {
-  perSystem = { system, config, ... }:
+  perSystem = { config, ... }:
     let
       rustFlake =
         config.lbf-nix.rustFlake {
-          inherit system;
           src = ./.;
           crane = inputs.crane;
           crateName = "lbr-prelude";
@@ -13,6 +12,7 @@
               path = ../lbr-prelude-derive;
             }
           ];
+          devShellHook = config.settings.shell.hook;
         };
     in
     {