separate wrapper build helper

Author: Zh40Le1ZOOB

default.nix

@@ -9,11 +9,21 @@ let
     lib.evalModules {
       modules = [
         ./modules/many-wrappers.nix
-      ] ++ modules;
+      ]
+      ++ modules;
       specialArgs = {
-        inherit pkgs;
-      } // specialArgs;
+        pkgs = extendPkgs pkgs;
+      }
+      // specialArgs;
     };
+
+  getPkgs =
+    pkgs:
+    pkgs.lib.packagesFromDirectoryRecursive {
+      inherit (pkgs) callPackage newScope;
+      directory = ./pkgs;
+    };
+  extendPkgs = pkgs: pkgs.extend (_: prev: getPkgs prev);
 in
 {
   lib = {
@@ -27,8 +37,9 @@ in
           module
         ];
         specialArgs = {
-          inherit pkgs;
+          pkgs = extendPkgs pkgs;
         };
       }).config.wrapped;
   };
+  inherit getPkgs;
 }

docs/readme.md

@@ -28,7 +28,7 @@
       "--config"
       ./config.nu
     ];
-    env.STARSHIP_CONFIG.value = ../starship.toml;
+    envVars.STARSHIP_CONFIG.value = ../starship.toml;
     pathAdd = [
       pkgs.starship
       pkgs.carapace
@@ -119,7 +119,7 @@ let
   # Wrap a singular package
   myGit = wrapper-manager.lib.wrapWith pkgs {
     basePackage = pkgs.git;
-    env.GIT_CONFIG.value = ./gitconfig;
+    envVars.GIT_CONFIG.value = ./gitconfig;
   };
   #=> «derivation /nix/store/...»
 in
@@ -172,6 +172,12 @@ https://github.com/viperML/wrapper-manager/issues
 
 ## Changelog
 
+- 2025-08-13
+  - Separate wrapper build helper from module system
+  - Add `helpers` output, currently has `mkWrapper`
+  - `wrapFlags` now read-only for access to final flags
+  - `env` has been renamed to `envVars`
+
 - 2025-06-19
   - Full rewrite
   - `flags` has been removed in favor of `prependFlags`

modules/common-wrapper.nix renamed to modules/common-wrapper-args.nix

@@ -5,20 +5,23 @@
   ...
 }:
 let
-  inherit (lib) mkOption types flatten;
+  inherit (lib)
+    mkRenamedOptionModule
+    mkOption
+    types
+    flatten
+    ;
   inherit (builtins) attrValues;
   flagsType = with types; listOf (coercedTo anything (x: "${x}") str);
 in
 {
+  imports = [ (mkRenamedOptionModule [ "env" ] [ "envVars" ]) ];
+
   options = {
     wrapFlags = mkOption {
-      type = flagsType;
-      default = [ ];
-      description = "Structured flags passed to makeWrapper.";
-      example = [
-        "--argv0"
-        "myprog"
-      ];
+      type = with types; separatedString " ";
+      readOnly = true;
+      description = "(Read-only) Final flags to wrap with";
     };
     appendFlags = mkOption {
       type = flagsType;
@@ -51,7 +54,7 @@ in
         ["--config-file" ./config.toml]
       '';
     };
-    env = mkOption {
+    envVars = mkOption {
       type = with types; attrsOf (submodule ./env-type.nix);
       default = { };
       description = "Structured configuration for environment variables.";
@@ -90,31 +93,34 @@ in
 
   config = {
     wrapFlags =
-      (flatten (
-        map (f: [
-          "--add-flag"
-          f
-        ]) config.prependFlags
-      ))
-      # Force the eval of config.flags to trigger throw
-      ++ (flatten (
-        map (f: [
-          "--add-flag"
-          f
-        ]) config.flags
-      ))
-      ++ (flatten (
-        map (f: [
-          "--append-flag"
-          f
-        ]) config.appendFlags
+      (lib.escapeShellArgs (
+        (flatten (
+          map (f: [
+            "--add-flag"
+            f
+          ]) config.prependFlags
+        ))
+        # Force the eval of config.flags to trigger throw
+        ++ (flatten (
+          map (f: [
+            "--add-flag"
+            f
+          ]) config.flags
+        ))
+        ++ (flatten (
+          map (f: [
+            "--append-flag"
+            f
+          ]) config.appendFlags
+        ))
+        ++ (lib.optionals (config.pathAdd != [ ]) [
+          "--prefix"
+          "PATH"
+          ":"
+          (lib.makeBinPath config.pathAdd)
+        ])
+        ++ (flatten (map (e: e.asFlags) (attrValues config.envVars)))
       ))
-      ++ (lib.optionals (config.pathAdd != [ ]) [
-        "--prefix"
-        "PATH"
-        ":"
-        (lib.makeBinPath config.pathAdd)
-      ])
-      ++ (flatten (map (e: e.asFlags) (attrValues config.env)));
+      + config.extraWrapperFlags;
   };
 }

modules/env-type.nix

@@ -70,13 +70,13 @@ in
             (lib.warn ''
               ${
                 lib.showOption [
-                  "env"
+                  "envVars"
                   config.name
                   "value"
                 ]
               } is null (indicating unsetting the variable), but ${
                 lib.showOption [
-                  "env"
+                  "envVars"
                   config.name
                   "force"
                 ]

modules/wrapper-args.nix

@@ -0,0 +1,76 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  inherit (lib) mkOption types;
+
+in
+{
+  imports = [
+    ./common-wrapper-args.nix
+  ];
+
+  options = {
+    basePackage = mkOption {
+      type = with types; package;
+      description = "Program to be wrapped";
+    };
+
+    extraPackages = mkOption {
+      type = with types; listOf package;
+      default = [ ];
+      description = "Optional extra packages to also wrap";
+    };
+
+    programs = mkOption {
+      default = { };
+      description = "Wrap specific binaries with specific options. You may use it to skip wrapping some program.";
+      example = lib.literalExpression ''
+        {
+          supervim = {
+            target = "neovim";
+          };
+
+          git = {
+            envVars.GIT_CONFIG.value = ./gitconfig;
+          };
+
+          # Don't wrap scalar
+          scalar = {};
+        }
+      '';
+      type = types.attrsOf (
+        types.submoduleWith {
+          modules = [
+            ./common-wrapper-args.nix
+            (
+              { name, ... }:
+              {
+                options = {
+                  name = mkOption {
+                    type = types.str;
+                    default = name;
+                    description = "Name of the program";
+                  };
+
+                  target = mkOption {
+                    type = with types; nullOr str;
+                    default = null;
+                    description = "Target of the program";
+                  };
+                };
+
+                config = {
+                  wrapperType = lib.mkDefault config.wrapperType;
+                };
+              }
+            )
+          ];
+        }
+      );
+    };
+  };
+}