Merge pull request #121 from zimward/push-zsprtpvprpuk

lib/wrapPackage: add patchHook

Author: zimward

README.md

@@ -146,6 +146,7 @@ Arguments:
   - Example: `["bin/*", "lib/*.sh"]` to replace original package paths with wrapped package paths
   - Desktop files are patched by default to update Exec= and Icon= paths
 - `filesToExclude`: List of file paths (glob patterns) to exclude from the wrapped package (default: `[]`)
+- `patchHook`: Shell script that runs after patchPhase to modify the wrapper package files
 - `wrapper`: Custom wrapper function (optional, overrides default exec wrapper)
 
 The function:

checks/patchHook.nix

@@ -0,0 +1,42 @@
+{
+  pkgs,
+  self,
+}:
+
+let
+  # Create a dummy package with a desktop file that references itself
+  dummyPackage =
+    (pkgs.runCommand "dummy-app" { } ''
+      # empty dir as a package
+      mkdir -p $out
+    '')
+    // {
+      meta.mainProgram = "dummy-app";
+    };
+
+  # Wrap the package
+  wrappedPackage = self.lib.wrapPackage {
+    inherit pkgs;
+    package = dummyPackage;
+    patchHook = ''
+      touch $out/test
+    '';
+  };
+
+in
+pkgs.runCommand "patchHook-test"
+  {
+    wrappedPath = "${wrappedPackage}";
+  }
+  ''
+    echo "Testing patchHook functionality..."
+    echo "Wrapped package path: $wrappedPath"
+
+    if [ ! -f "$wrappedPath/test" ]; then
+      echo "FAIL: file not created in patched package"
+      exit 1
+    fi
+
+    echo "SUCCESS: patchHook executed correctly"
+    touch $out
+  ''

lib/default.nix

@@ -384,6 +384,7 @@ let
     - `aliases`: List of additional names to symlink to the wrapped executable (optional)
     - `filesToPatch`: List of file paths (glob patterns) to patch for self-references (optional, defaults to ["share/applications/*.desktop"])
     - `filesToExclude`: List of file paths (glob patterns) to exclude from the wrapped package (optional, defaults to [])
+    - `patchHook`: Shell script that runs after patchPhase to modify the wrapper package files
     - `wrapper`: Custom wrapper function (optional, defaults to exec'ing the original binary with args)
       - Called with { env, flags, args, envString, flagsString, exePath, preHook }
 
@@ -451,6 +452,7 @@ let
       filesToPatch ? [ "share/applications/*.desktop" ],
       # List of file paths (glob patterns) to exclude from the wrapped package (e.g., ["bin/unwanted-*", "share/doc/*"])
       filesToExclude ? [ ],
+      patchHook ? "",
       wrapper ? (
         {
           exePath,
@@ -511,6 +513,7 @@ let
           binName ? null,
           filesToPatch ? [ ],
           filesToExclude ? [ ],
+          patchHook ? "",
           ...
         }@args:
         pkgs.stdenv.mkDerivation (
@@ -566,6 +569,7 @@ let
                   done
                 '') filesToPatch}
               ''}
+              ${patchHook}
 
               # Create symlinks for aliases
               ${lib.optionalString (aliases != [ ] && binName != null) ''
@@ -604,6 +608,7 @@ let
             "binName"
             "filesToPatch"
             "filesToExclude"
+            "patchHook"
           ])
         );
 
@@ -638,6 +643,7 @@ let
             binName
             filesToPatch
             filesToExclude
+            patchHook
             ;
           passthru =
             (package.passthru or { })