Merge pull request #175 from BirdeeHub/makeWrapper

refactor(modules.makeWrapper): contain wrapperFunction logic to wrapperFunction

Author: BirdeeHub

lib/core.nix

@@ -4,6 +4,8 @@
   lib,
   wlib,
   extendModules,
+  # NOTE: makes sure builderFunction and wrapperFunction get name from _module.args
+  name ? null,
   ...
 }@args:
 let

modules/makeWrapper/default.nix

@@ -0,0 +1,4 @@
+{ config, callPackage, ... }@args:
+callPackage (
+  if config.wrapperImplementation or "nix" == "nix" then ./makeWrapperNix.nix else ./makeWrapper.nix
+) args

modules/makeWrapper/makeWrapper.nix

@@ -2,6 +2,9 @@
   config,
   wlib,
   lib,
+  makeWrapper,
+  makeBinaryWrapper,
+  dieHook,
   ...
 }:
 let
@@ -117,8 +120,16 @@ let
     ))
     lib.flatten
   ];
+
+  srcsetup = p: "source ${lib.escapeShellArg "${p}/nix-support/setup-hook"}";
 in
 if config.binName == "" then
   ""
 else
-  "makeWrapper ${baseArgs} ${builtins.concatStringsSep " " resArgs}"
+  ''
+    $(
+      ${srcsetup dieHook}
+      ${srcsetup (if config.wrapperImplementation == "shell" then makeWrapper else makeBinaryWrapper)}
+      makeWrapper ${baseArgs} ${builtins.concatStringsSep " " resArgs}
+    )
+  ''