From 7793b7d8af601353e236252922abe84c5e9b79d0 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sat, 19 Mar 2022 16:56:48 -0600
Subject: home: improve shenv infra

---
 pkgs/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 35cf2bf..5ee0a63 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,9 +1,14 @@
-{ pkgs, util }: let
-  inherit (pkgs) callPackage;
+{ pkgs, util }:
+with pkgs.lib; let
+  inherit (pkgs) buildEnv callPackage writeTextDir;
 in {
   shenvs = let
-    env = name: env: pkgs.buildEnv (env pkgs // { name = "shenv-${name}"; });
-  in pkgs.lib.mapAttrs env (util.importAll {
+    build = name: { paths, enter ? null }: buildEnv {
+      name = "shenv-${name}";
+      paths = (optional (enter != null) (writeTextDir "lib/shenv/enter" enter))
+            ++ paths;
+    };
+  in pkgs.lib.mapAttrs (name: shenv: build name (shenv pkgs)) (util.importAll {
     root = ../shenvs;
     exclude = [ "config" ];
   });
-- 
cgit v1.2.3