From 025b4f043a8192a7fa05d7ef2c07b603414b9d06 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.
---
 subprojects/wrapper-manager-fds/default.nix     | 2 +-
 subprojects/wrapper-manager-fds/lib/default.nix | 2 +-
 subprojects/wrapper-manager-fds/lib/env.nix     | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/subprojects/wrapper-manager-fds/default.nix b/subprojects/wrapper-manager-fds/default.nix
index 917af49d..7d0c97a1 100644
--- a/subprojects/wrapper-manager-fds/default.nix
+++ b/subprojects/wrapper-manager-fds/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/subprojects/wrapper-manager-fds/lib/default.nix b/subprojects/wrapper-manager-fds/lib/default.nix
index 63f37e19..c244de9f 100644
--- a/subprojects/wrapper-manager-fds/lib/default.nix
+++ b/subprojects/wrapper-manager-fds/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/subprojects/wrapper-manager-fds/lib/env.nix b/subprojects/wrapper-manager-fds/lib/env.nix
index d1701e78..bb15ce57 100644
--- a/subprojects/wrapper-manager-fds/lib/env.nix
+++ b/subprojects/wrapper-manager-fds/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.