add specialArg and test

closes #10
viperML · Nov 6, 2023 · 2ce0163 · 2ce0163
1 parent 34316bc
commit 2ce0163
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/doc/content/_index.md b/doc/content/_index.md
@@ -150,6 +150,9 @@ https://github.com/viperML/wrapper-manager/issues
 
 ## Changelog
 
+- 2023-11-06
+  - Users can now pass their own `specialArgs`
+
 - 2023-10-05
   - Changed wrapper.name.env to be an attrset instead
   - Added the ability to unset a variable with wrapper.name.env.unset

diff --git a/flake.nix b/flake.nix
@@ -36,6 +36,9 @@
       (self.lib {
         inherit pkgs;
         modules = [./tests/test-module.nix];
+        specialArgs = {
+          some-special-arg = "foo";
+        };
       })
       .config
       .build

diff --git a/lib.nix b/lib.nix
@@ -2,17 +2,15 @@
   eval = {
     pkgs,
     modules ? [],
+    specialArgs ? {},
   }:
     lib.evalModules {
       modules =
         [
           ./modules
-          {
-            _module.args.pkgs = pkgs;
-          }
         ]
         ++ modules;
-      specialArgs = {};
+      specialArgs = {inherit pkgs;} // specialArgs;
     };
 in {
   __functor = _: eval;

diff --git a/tests/test-module.nix b/tests/test-module.nix
@@ -1,21 +1,24 @@
 {
   pkgs,
   lib,
+  some-special-arg,
   ...
 }: {
   wrappers.hello = {
     env.FOO.value = "foo";
     env.BAR.value = "bar";
     basePackage = pkgs.hello;
     flags = [
-      "-g Greetings"
+      "-g"
+      some-special-arg
     ];
   };
 
   wrappers.neofetch = {
     basePackage = pkgs.neofetch.override {x11Support = false;};
     flags = [
-      "--ascii_distro guix"
+      "--ascii_distro"
+      "guix"
     ];
     renames = {
       "neofetch" = "neofetch2";