From a51da4ca6c9d116290880ee38f247144f514227f Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Mon, 21 Mar 2022 21:42:02 +0100
Subject: [PATCH] packages/reflex-cache: use custom devshell

---
 packages/lib/devshell.nix | 4 +++-
 packages/projects.nix     | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/lib/devshell.nix b/packages/lib/devshell.nix
index bab9629..ec2b77b 100644
--- a/packages/lib/devshell.nix
+++ b/packages/lib/devshell.nix
@@ -4,7 +4,9 @@ let
   
   inherit (inputs.devshell.legacyPackages.${system}) mkShell;
   
-  injectAttrName = name: value: value // { inherit name; };
+  wrapInAttrs = value: if builtins.isAttrs value then value else { inherit value; };
+  
+  injectAttrName = name: value: { inherit name; } // wrapInAttrs value;
   
   mkNamedAttrs = builtins.mapAttrs injectAttrName;
   
diff --git a/packages/projects.nix b/packages/projects.nix
index e72861d..e9e2a1e 100644
--- a/packages/projects.nix
+++ b/packages/projects.nix
@@ -41,13 +41,14 @@ in
   devShells = {
     reflex-cache = let
       inherit (inputs.self.packages.${system}) reflex-cache;
-    in pkgs.mkShell {
-      buildInputs = with pkgs; [
-        poetry
+    in mkShell {
+      packages = [
         reflex-cache.dependencyEnv
       ];
+      
+      commands.poetry.package = pkgs.poetry;
 
-      PYTHON = reflex-cache.dependencyEnv.interpreter;
+      env.PYTHON = reflex-cache.dependencyEnv.interpreter;
     };
   };
 }