From 3b261d85b0f6d42b79683e35e0a0508f82bbfa25 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Tue, 9 Jul 2024 23:17:52 +0800
Subject: [PATCH] wrapper-manager-fds/lib: make eval functions easier to import

This is to make wrapper-manager-fds easier to bootstrap whether used
with flakes or not.
---
 default.nix     | 2 +-
 lib/default.nix | 2 +-
 lib/env.nix     | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 917af49..7d0c97a 100644
--- a/default.nix
+++ b/default.nix
@@ -13,6 +13,6 @@
     wrapper-manager = ./modules/env/home-manager;
   };
 
-  wrapperManagerModules.default = ./modules/wrapper-manager;
+  lib = import ./lib/env.nix;
   wrapperManagerLib = ./lib;
 }
diff --git a/lib/default.nix b/lib/default.nix
index 63f37e1..c244de9 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -16,7 +16,7 @@ pkgs.lib.makeExtensible
   in
   {
     build-support = callLibs ./build-support.nix;
-    env = callLibs ./env.nix;
+    env = import ./env.nix;
     utils = callLibs ./utils.nix;
 
     inherit (self.build-support) mkWrapper mkWrappedPackage;
diff --git a/lib/env.nix b/lib/env.nix
index d1701e7..bb15ce5 100644
--- a/lib/env.nix
+++ b/lib/env.nix
@@ -1,5 +1,3 @@
-{ pkgs, lib, self }:
-
 rec {
   /* Given the attrset for evaluating a wrapper-manager module, return a
      derivation containing the wrapper.