From 29651d086bb4ce2e2b2f4d43cdfa81e66285d76a Mon Sep 17 00:00:00 2001
From: Yannik Sander <me@ysndr.de>
Date: Wed, 15 Dec 2021 02:38:06 +0100
Subject: [PATCH] Fix/devshell (#390)

* Fix flake-info attribute name in devShell definition

* Export rust stdlib path though shell hook

* Format flake.nix
---
 flake.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index b20cb59..0bf3505 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,10 @@
         let
           pkgs = import nixpkgs {
             inherit system;
-            overlays = [];
+            overlays = [ ];
           };
         in
-          import path { inherit pkgs; };
+        import path { inherit pkgs; };
       packages = system:
         {
           flake-info = mkPackage ./flake-info system;
@@ -24,18 +24,21 @@
         };
 
       devShell = system:
-        let packages_inst = (packages system);
+        let
+          packages_inst = (packages system);
+          pkgs = nixpkgs.legacyPackages.${system};
         in
-        nixpkgs.legacyPackages.${system}.mkShell {
+        pkgs.mkShell {
           inputsFrom = builtins.attrValues packages_inst;
           shellHook = ''
-            export NIXPKGS_PANDOC_FILTERS_PATH="${packages_inst.flake_info.NIXPKGS_PANDOC_FILTERS_PATH}";
+            export RUST_SRC_PATH="${pkgs.rustPlatform.rustLibSrc}";
+            export NIXPKGS_PANDOC_FILTERS_PATH="${packages_inst.flake-info.NIXPKGS_PANDOC_FILTERS_PATH}";
           '';
         };
     in
-      {
-        defaultPackage = forAllSystems (mkPackage ./.);
-        packages = forAllSystems packages;
-        devShell = forAllSystems devShell;
-      };
+    {
+      defaultPackage = forAllSystems (mkPackage ./.);
+      packages = forAllSystems packages;
+      devShell = forAllSystems devShell;
+    };
 }